Fix setting const qualifier on indexing expression

src/compiler/translator/ParseContext.cpp

@@ -2872,51 +2872,36 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
     }
     else if (baseExpression->isArray())
     {
-        const TType &baseType = baseExpression->getType();
-        if (baseType.getStruct())
-        {
-            TType copyOfType(baseType.getStruct());
-            indexedExpression->setType(copyOfType);
-        }
-        else if (baseType.isInterfaceBlock())
-        {
-            TType copyOfType(baseType.getInterfaceBlock(), baseType.getQualifier(),
-                             baseType.getLayoutQualifier(), 0);
-            indexedExpression->setType(copyOfType);
-        }
-        else
-        {
-            indexedExpression->setType(
-                TType(baseExpression->getBasicType(), baseExpression->getPrecision(), EvqTemporary,
-                      static_cast<unsigned char>(baseExpression->getNominalSize()),
-                      static_cast<unsigned char>(baseExpression->getSecondarySize())));
-        }
-
-        if (baseExpression->getType().getQualifier() == EvqConst)
-        {
-            indexedExpression->getTypePointer()->setQualifier(EvqConst);
-        }
+        TType indexedType = baseExpression->getType();
+        indexedType.clearArrayness();
+        indexedExpression->setType(indexedType);
     }
     else if (baseExpression->isMatrix())
     {
-        TQualifier qualifier =
-            baseExpression->getType().getQualifier() == EvqConst ? EvqConst : EvqTemporary;
         indexedExpression->setType(TType(baseExpression->getBasicType(),
-                                         baseExpression->getPrecision(), qualifier,
+                                         baseExpression->getPrecision(), EvqTemporary,
                                          static_cast<unsigned char>(baseExpression->getRows())));
     }
     else if (baseExpression->isVector())
     {
-        TQualifier qualifier =
-            baseExpression->getType().getQualifier() == EvqConst ? EvqConst : EvqTemporary;
         indexedExpression->setType(
-            TType(baseExpression->getBasicType(), baseExpression->getPrecision(), qualifier));
+            TType(baseExpression->getBasicType(), baseExpression->getPrecision(), EvqTemporary));
     }
     else
     {
         indexedExpression->setType(baseExpression->getType());
     }
 
+    if (baseExpression->getType().getQualifier() == EvqConst &&
+        indexExpression->getType().getQualifier() == EvqConst)
+    {
+        indexedExpression->getTypePointer()->setQualifier(EvqConst);
+    }
+    else
+    {
+        indexedExpression->getTypePointer()->setQualifier(EvqTemporary);
+    }
+
     return indexedExpression;
 }
 

src/tests/compiler_tests/MalformedShader_test.cpp

@@ -872,3 +872,47 @@ TEST_F(MalformedShaderTest, FragmentShaderInputStructWithInt)
         FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
     }
 }
+
+// Selecting a field of a vector that's the result of dynamic indexing a constant array should work.
+TEST_F(MalformedShaderTest, ShaderSelectingFieldOfVectorIndexedFromArray)
+{
+    const std::string &shaderString =
+        "#version 300 es\n"
+        "precision mediump float;\n"
+        "out vec4 my_FragColor;\n"
+        "uniform int i;\n"
+        "void main() {\n"
+        "    float f = vec2[1](vec2(0.0, 0.1))[i].x;\n"
+        "    my_FragColor = vec4(f);\n"
+        "}\n";
+    if (!compile(shaderString))
+    {
+        FAIL() << "Shader compilation failed, expecting success " << mInfoLog;
+    }
+}
+
+// Passing an array into a function and then passing a value from that array into another function
+// should work. This is a regression test for a bug where the mangled name of a TType was not
+// properly updated when determining the type resulting from array indexing.
+TEST_F(MalformedShaderTest, ArrayValueFromFunctionParameterAsParameter)
+{
+    const std::string &shaderString =
+        "precision mediump float;\n"
+        "uniform float u;\n"
+        "float foo(float f) {\n"
+        "   return f * 2.0;\n"
+        "}\n"
+        "float bar(float[2] f) {\n"
+        "    return foo(f[0]);\n"
+        "}\n"
+        "void main()\n"
+        "{\n"
+        "    float arr[2];\n"
+        "    arr[0] = u;\n"
+        "    gl_FragColor = vec4(bar(arr));\n"
+        "}\n";
+    if (!compile(shaderString))
+    {
+        FAIL() << "Shader compilation failed, expecting success " << mInfoLog;
+    }
+}