diff --git a/.pick_status.json b/.pick_status.json
index 89eeb1f0e95..cb1385cb9ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3757,7 +3757,7 @@
         "description": "glsl: Fix yylloc.source propagation in YYLLOC_DEFAULT",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a0cfe8c44085032fd982bbbff1f02252ffaa7114"
     },
diff --git a/src/compiler/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h
index b797433adb1..d1d22274f29 100644
--- a/src/compiler/glsl/glcpp/glcpp.h
+++ b/src/compiler/glsl/glcpp/glcpp.h
@@ -91,6 +91,7 @@ do {								\
       (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
       (Current).last_line    = YYRHSLOC(Rhs, N).last_line;	\
       (Current).last_column  = YYRHSLOC(Rhs, N).last_column;	\
+      (Current).source       = YYRHSLOC(Rhs, N).source;		\
    }								\
    else								\
    {								\
@@ -98,8 +99,8 @@ do {								\
 	 YYRHSLOC(Rhs, 0).last_line;				\
       (Current).first_column = (Current).last_column =		\
 	 YYRHSLOC(Rhs, 0).last_column;				\
+      (Current).source       = YYRHSLOC(Rhs, 0).source;		\
    }								\
-   (Current).source = 0;					\
 } while (0)
 
 struct token {
diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index a8fb7a5572c..fc6e4877824 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -998,6 +998,7 @@ do {                                                            \
       (Current).last_line    = YYRHSLOC(Rhs, N).last_line;      \
       (Current).last_column  = YYRHSLOC(Rhs, N).last_column;    \
       (Current).path         = YYRHSLOC(Rhs, N).path;           \
+      (Current).source       = YYRHSLOC(Rhs, N).source;         \
    }                                                            \
    else                                                         \
    {                                                            \
@@ -1005,9 +1006,9 @@ do {                                                            \
          YYRHSLOC(Rhs, 0).last_line;                            \
       (Current).first_column = (Current).last_column =          \
          YYRHSLOC(Rhs, 0).last_column;                          \
-      (Current).path = YYRHSLOC(Rhs, 0).path;                   \
+      (Current).path         = YYRHSLOC(Rhs, 0).path;           \
+      (Current).source       = YYRHSLOC(Rhs, 0).source;         \
    }                                                            \
-   (Current).source = 0;                                        \
 } while (0)
 
 /**