commit 596018ce7b6aa6faf45196febd597f051a626c94
author Jamie Madill <jmadill@chromium.org> Wed Sep 21 12:57:03 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Sep 22 16:17:56 2016 +0000
tree d225a089d6961c919457623840cd77415e58e6e5
parent d2f195b5a4b266be817193ed004c26535a32723a

translator: Refactor Constant Union shift ops.

In preparation for making them robust.

BUG=chromium:648135

Change-Id: I88fc87d8887064fda04087c56de05d8725a6fe5f
Reviewed-on: https://chromium-review.googlesource.com/387469
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/ConstantUnion.cpp

diff --git a/src/compiler/translator/ConstantUnion.cpp b/src/compiler/translator/ConstantUnion.cpp
index 74bf570..6ef6179 100644
--- a/src/compiler/translator/ConstantUnion.cpp
+++ b/src/compiler/translator/ConstantUnion.cpp
@@ -369,17 +369,21 @@
     return returnValue;
 }
 
-TConstantUnion TConstantUnion::operator>>(const TConstantUnion &constant) const
+// static
+TConstantUnion TConstantUnion::rshift(const TConstantUnion &lhs,
+                                      const TConstantUnion &rhs,
+                                      TDiagnostics *diag,
+                                      const TSourceLoc &line)
 {
     TConstantUnion returnValue;
-    ASSERT(type == constant.type);
-    switch (type)
+    ASSERT((lhs.type == rhs.type) && (lhs.type == EbtInt || lhs.type == EbtUInt));
+    switch (lhs.type)
     {
         case EbtInt:
-            returnValue.setIConst(iConst >> constant.iConst);
+            returnValue.setIConst(lhs.iConst >> rhs.iConst);
             break;
         case EbtUInt:
-            returnValue.setUConst(uConst >> constant.uConst);
+            returnValue.setUConst(lhs.uConst >> rhs.uConst);
             break;
         default:
             UNREACHABLE();
@@ -388,20 +392,24 @@
     return returnValue;
 }
 
-TConstantUnion TConstantUnion::operator<<(const TConstantUnion &constant) const
+// static
+TConstantUnion TConstantUnion::lshift(const TConstantUnion &lhs,
+                                      const TConstantUnion &rhs,
+                                      TDiagnostics *diag,
+                                      const TSourceLoc &line)
 {
     TConstantUnion returnValue;
     // The signedness of the second parameter might be different, but we
     // don't care, since the result is undefined if the second parameter is
     // negative, and aliasing should not be a problem with unions.
-    ASSERT(constant.type == EbtInt || constant.type == EbtUInt);
-    switch (type)
+    ASSERT((lhs.type == rhs.type) && (lhs.type == EbtInt || lhs.type == EbtUInt));
+    switch (lhs.type)
     {
         case EbtInt:
-            returnValue.setIConst(iConst << constant.iConst);
+            returnValue.setIConst(lhs.iConst << rhs.iConst);
             break;
         case EbtUInt:
-            returnValue.setUConst(uConst << constant.uConst);
+            returnValue.setUConst(lhs.uConst << rhs.uConst);
             break;
         default:
             UNREACHABLE();