Mesa (18.2): Revert "glsl: skip stringification in preprocessor if in unreachable branch"

[GitLab Mirror]

Module: Mesa
Branch: 18.2
Commit: 2fd6f06faabb5b16d529e035ae4523a8566bf9bc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fd6f06faabb5b16d529e035ae4523a8566bf9bc

Author: Andres Gomez <agomez at igalia.com>
Date:   Fri Sep  7 18:22:09 2018 +0300

Revert "glsl: skip stringification in preprocessor if in unreachable branch"

This reverts commit c52bcfa61ca48b530dce1d6bf65113d8d087fccf.

This revealed the bug reported at:
https://bugs.freedesktop.org/show_bug.cgi?id=107772

Signed-off-by: Andres Gomez <agomez at igalia.com>

---

 src/compiler/glsl/glcpp/glcpp-lex.l | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/compiler/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l
index fe5845acd4..9cfcc12022 100644
--- a/src/compiler/glsl/glcpp/glcpp-lex.l
+++ b/src/compiler/glsl/glcpp/glcpp-lex.l
@@ -420,10 +420,8 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 
 	/* This will catch any non-directive garbage after a HASH */
 <HASH>{NONSPACE} {
-	if (!parser->skipping) {
-		BEGIN INITIAL;
-		RETURN_TOKEN (GARBAGE);
-	}
+	BEGIN INITIAL;
+	RETURN_TOKEN (GARBAGE);
 }
 
 	/* An identifier immediately followed by '(' */