commit 485eefdd1c9d0133eb6a71e6c1ed9605e4d88472
author Olli Etuaho <oetuaho@nvidia.com> Tue Feb 14 17:40:06 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Feb 15 10:39:51 2017 +0000
tree 0a56a30778b03f225f069a3fa5137f1dfab43c1a
parent 6c1f671b361e138274ca84b0fa75b2af919b5a0c

Fix checking image memory access

Checks for image memory access used to assume that image nodes are
symbol nodes, but they can also be array indexing nodes. In invalid
shaders struct indexing nodes of an image type may also appear after
error recovery.

TEST=angle_unittests, dEQP-GLES31.functional.layout_binding.*
BUG=angleproject:1442

Change-Id: Ib45728d38485cb78c594e080f3decec1233a0046
Reviewed-on: https://chromium-review.googlesource.com/442764
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index d807ea8..e4aa5a1 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -66,6 +66,24 @@
     return false;
 }
 
+// Get a token from an image argument to use as an error message token.
+const char *GetImageArgumentToken(TIntermTyped *imageNode)
+{
+    ASSERT(IsImage(imageNode->getBasicType()));
+    while (imageNode->getAsBinaryNode() &&
+           (imageNode->getAsBinaryNode()->getOp() == EOpIndexIndirect ||
+            imageNode->getAsBinaryNode()->getOp() == EOpIndexDirect))
+    {
+        imageNode = imageNode->getAsBinaryNode()->getLeft();
+    }
+    TIntermSymbol *imageSymbol = imageNode->getAsSymbolNode();
+    if (imageSymbol)
+    {
+        return imageSymbol->getSymbol().c_str();
+    }
+    return "image";
+}
+
 }  // namespace
 
 TParseContext::TParseContext(TSymbolTable &symt,
@@ -4184,10 +4202,9 @@
     if (name.compare(0, 5, "image") == 0)
     {
         TIntermSequence *arguments = functionCall->getSequence();
-        TIntermNode *imageNode     = (*arguments)[0];
-        TIntermSymbol *imageSymbol = imageNode->getAsSymbolNode();
+        TIntermTyped *imageNode    = (*arguments)[0]->getAsTyped();
 
-        const TMemoryQualifier &memoryQualifier = imageSymbol->getMemoryQualifier();
+        const TMemoryQualifier &memoryQualifier = imageNode->getMemoryQualifier();
 
         if (name.compare(5, 5, "Store") == 0)
         {
@@ -4195,7 +4212,7 @@
             {
                 error(imageNode->getLine(),
                       "'imageStore' cannot be used with images qualified as 'readonly'",
-                      imageSymbol->getSymbol().c_str());
+                      GetImageArgumentToken(imageNode));
             }
         }
         else if (name.compare(5, 4, "Load") == 0)
@@ -4204,7 +4221,7 @@
             {
                 error(imageNode->getLine(),
                       "'imageLoad' cannot be used with images qualified as 'writeonly'",
-                      imageSymbol->getSymbol().c_str());
+                      GetImageArgumentToken(imageNode));
             }
         }
     }
@@ -4223,7 +4240,8 @@
 
     for (size_t i = 0; i < arguments.size(); ++i)
     {
-        const TType &functionArgumentType  = arguments[i]->getAsTyped()->getType();
+        TIntermTyped *typedArgument        = arguments[i]->getAsTyped();
+        const TType &functionArgumentType  = typedArgument->getType();
         const TType &functionParameterType = *functionDefinition->getParam(i).type;
         ASSERT(functionArgumentType.getBasicType() == functionParameterType.getBasicType());
 
@@ -4238,7 +4256,7 @@
             {
                 error(functionCall->getLine(),
                       "Function call discards the 'readonly' qualifier from image",
-                      arguments[i]->getAsSymbolNode()->getSymbol().c_str());
+                      GetImageArgumentToken(typedArgument));
             }
 
             if (functionArgumentMemoryQualifier.writeonly &&
@@ -4246,7 +4264,7 @@
             {
                 error(functionCall->getLine(),
                       "Function call discards the 'writeonly' qualifier from image",
-                      arguments[i]->getAsSymbolNode()->getSymbol().c_str());
+                      GetImageArgumentToken(typedArgument));
             }
 
             if (functionArgumentMemoryQualifier.coherent &&
@@ -4254,7 +4272,7 @@
             {
                 error(functionCall->getLine(),
                       "Function call discards the 'coherent' qualifier from image",
-                      arguments[i]->getAsSymbolNode()->getSymbol().c_str());
+                      GetImageArgumentToken(typedArgument));
             }
 
             if (functionArgumentMemoryQualifier.volatileQualifier &&
@@ -4262,7 +4280,7 @@
             {
                 error(functionCall->getLine(),
                       "Function call discards the 'volatile' qualifier from image",
-                      arguments[i]->getAsSymbolNode()->getSymbol().c_str());
+                      GetImageArgumentToken(typedArgument));
             }
         }
     }