commit 5d507bc5f6f8be4c7059e72175cb07f68bbf5623
author Nicolas Capens <capn@google.com> Fri Dec 22 17:28:33 2017 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Jan 03 14:10:39 2018 +0000
tree a2ee92803c75b32990091a74d188e2e9944bcbdb
parent 9c010dd635ed3f4facc9ddb917cac59bfa1d080e

Only try folding constant array indexing if propagated.

The array folding logic generated an error when a constant array didn't
have an array of literal constants.

Change-Id: I48f58936cfa7e19e0f4026fb940654f20d9a9d5e
Reviewed-on: https://swiftshader-review.googlesource.com/15551
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/compiler/ParseHelper.cpp

diff --git a/src/OpenGL/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
index d057364..00f4829 100644
--- a/src/OpenGL/compiler/ParseHelper.cpp
+++ b/src/OpenGL/compiler/ParseHelper.cpp
@@ -2474,7 +2474,7 @@
 
 	TIntermConstantUnion *indexConstantUnion = indexExpression->getAsConstantUnion();
 
-	if(indexExpression->getQualifier() == EvqConstExpr && indexConstantUnion)
+	if(indexExpression->getQualifier() == EvqConstExpr && indexConstantUnion)   // TODO: Qualifier check redundant?
 	{
 		int index = indexConstantUnion->getIConst(0);
 		if(index < 0)
@@ -2486,7 +2486,7 @@
 			recover();
 			index = 0;
 		}
-		if(baseExpression->getType().getQualifier() == EvqConstExpr)
+		if(baseExpression->getType().getQualifier() == EvqConstExpr && baseExpression->getAsConstantUnion())   // TODO: Qualifier check redundant?
 		{
 			if(baseExpression->isArray())
 			{