Revert "Fix setting const qualifier on indexing expression"

src/compiler/translator/ParseContext.cpp

@@ -2872,36 +2872,51 @@ TIntermTyped *TParseContext::addIndexExpression(TIntermTyped *baseExpression,
     }
     else if (baseExpression->isArray())
     {
-        TType indexedType = baseExpression->getType();
-        indexedType.clearArrayness();
-        indexedExpression->setType(indexedType);
+        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);
+        }
     }
     else if (baseExpression->isMatrix())
     {
+        TQualifier qualifier =
+            baseExpression->getType().getQualifier() == EvqConst ? EvqConst : EvqTemporary;
         indexedExpression->setType(TType(baseExpression->getBasicType(),
-                                         baseExpression->getPrecision(), EvqTemporary,
+                                         baseExpression->getPrecision(), qualifier,
                                          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(), EvqTemporary));
+            TType(baseExpression->getBasicType(), baseExpression->getPrecision(), qualifier));
     }
     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,21 +872,3 @@ 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;
-    }
-}