glsl: Fix missing initialization of yylloc.source

In both the preprocessor and in the compiler proper, we use a custom
yyltype struct to allow tracking the source-string number in addition
to line and column. However, we were previously relying on bison's
default initialization of the yyltype struct which of course is not
aware of the source field and leaves it uninitialized.

We fix this by defining our own YYLLOC_DEFAULT macro expanding on the
default version (as appears in the bison manual) and adding
initialization of yylloc.source.

diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index fc9511a67a86163a336970633df931f7c5718c2b..869de2efbcc7daf861c6306cb94269f12b8a8aad 100644 (file)
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
@@ -69,6 +69,25 @@ typedef struct YYLTYPE {
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 
+# define YYLLOC_DEFAULT(Current, Rhs, N)                       \
+do {                                                           \
+   if (N)                                                      \
+   {                                                           \
+      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;    \
+      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;  \
+      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;     \
+      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;   \
+   }                                                           \
+   else                                                                \
+   {                                                           \
+      (Current).first_line   = (Current).last_line =           \
+        YYRHSLOC(Rhs, 0).last_line;                            \
+      (Current).first_column = (Current).last_column =         \
+        YYRHSLOC(Rhs, 0).last_column;                          \
+   }                                                           \
+   (Current).source = 0;                                       \
+} while (0)
+
 struct token {
        int type;
        YYSTYPE value;

diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index e2efbd9ac9fcfa10dedb1c13407c4b77dda54d44..b50d9eea67625a822b92b2bbd953925abed31666 100644 (file)
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -137,6 +137,25 @@ typedef struct YYLTYPE {
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 
+# define YYLLOC_DEFAULT(Current, Rhs, N)                       \
+do {                                                           \
+   if (N)                                                      \
+   {                                                           \
+      (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;    \
+      (Current).first_column = YYRHSLOC(Rhs, 1).first_column;  \
+      (Current).last_line    = YYRHSLOC(Rhs, N).last_line;     \
+      (Current).last_column  = YYRHSLOC(Rhs, N).last_column;   \
+   }                                                           \
+   else                                                                \
+   {                                                           \
+      (Current).first_line   = (Current).last_line =           \
+        YYRHSLOC(Rhs, 0).last_line;                            \
+      (Current).first_column = (Current).last_column =         \
+        YYRHSLOC(Rhs, 0).last_column;                          \
+   }                                                           \
+   (Current).source = 0;                                       \
+} while (0)
+
 extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
                             const char *fmt, ...);