ConstantUnion: Error on undefined shift.

src/compiler/translator/ConstantUnion.cpp

@@ -380,11 +380,21 @@ TConstantUnion TConstantUnion::rshift(const TConstantUnion &lhs,
     switch (lhs.type)
     {
         case EbtInt:
-            returnValue.setIConst(lhs.iConst >> rhs.iConst);
+            if (lhs.iConst < 0 || rhs.iConst < 0)
+            {
+                diag->error(line, "Undefined shift", ">>", "");
+                returnValue.setIConst(0);
+            }
+            else
+            {
+                returnValue.setIConst(lhs.iConst >> rhs.iConst);
+            }
             break;
+
         case EbtUInt:
             returnValue.setUConst(lhs.uConst >> rhs.uConst);
             break;
+
         default:
             UNREACHABLE();
     }
@@ -406,11 +416,21 @@ TConstantUnion TConstantUnion::lshift(const TConstantUnion &lhs,
     switch (lhs.type)
     {
         case EbtInt:
-            returnValue.setIConst(lhs.iConst << rhs.iConst);
+            if (lhs.iConst < 0 || rhs.iConst < 0)
+            {
+                diag->error(line, "Undefined shift", "<<", "");
+                returnValue.setIConst(0);
+            }
+            else
+            {
+                returnValue.setIConst(lhs.iConst << rhs.iConst);
+            }
             break;
+
         case EbtUInt:
             returnValue.setUConst(lhs.uConst << rhs.uConst);
             break;
+
         default:
             UNREACHABLE();
     }

src/tests/gl_tests/GLSLTest.cpp

@@ -2433,6 +2433,42 @@ TEST_P(GLSLTest, FoldedIntDifferenceOutOfBounds)
     glDeleteProgram(program);
 }
 
+// Test that using an invalid constant right-shift produces an error.
+TEST_P(GLSLTest_ES3, FoldedInvalidRightShift)
+{
+    const std::string &fragmentShader =
+        "#version 300 es\n"
+        "precision mediump float;\n"
+        "out vec4 color;\n"
+        "void main(void)\n"
+        "{\n"
+        " int diff = -100 >> -100;\n"
+        " color = vec4(float(diff));\n"
+        "}\n";
+
+    GLuint program = CompileProgram(mSimpleVSSource, fragmentShader);
+    EXPECT_EQ(0u, program);
+    glDeleteProgram(program);
+}
+
+// Test that using an invalid constant left-shift produces an error.
+TEST_P(GLSLTest_ES3, FoldedInvalidLeftShift)
+{
+    const std::string &fragmentShader =
+        "#version 300 es\n"
+        "precision mediump float;\n"
+        "out vec4 color;\n"
+        "void main(void)\n"
+        "{\n"
+        " int diff = -100 << -100;\n"
+        " color = vec4(float(diff));\n"
+        "}\n";
+
+    GLuint program = CompileProgram(mSimpleVSSource, fragmentShader);
+    EXPECT_EQ(0u, program);
+    glDeleteProgram(program);
+}
+
 }  // anonymous namespace
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.