Revert "Revert "Make sure type gets set consistently in folded binary operations""

This patch was originally reverted only because a dependency patch failed a buggy Chromium test. This reverts commit aebd002d. TEST=dEQP-GLES3.functional.shaders.constant_expressions.* BUG=angleproject:817 Change-Id: Ia5acf15518ea89717c0cfe1398cb18ea27be5b19 Reviewed-on: https://chromium-review.googlesource.com/275811Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Revert "Revert "Make sure type gets set consistently in folded binary operations""
2c4b746c · Olli Etuaho · bd4cfdcd · 2c4b746c · 2c4b746c · 2c4b746c
Commit 2c4b746c authored Jun 08, 2015 by Olli Etuaho
Showing with 7 additions and 14 deletions

IntermNode.cpp src/compiler/translator/IntermNode.cpp +0 -0

IntermNode.h src/compiler/translator/IntermNode.h +3 -1

Intermediate.cpp src/compiler/translator/Intermediate.cpp +4 -13

No files found.
--- a/src/compiler/translator/IntermNode.cpp
+++ b/src/compiler/translator/IntermNode.cpp
--- a/src/compiler/translator/IntermNode.h
+++ b/src/compiler/translator/IntermNode.h
@@ -299,7 +299,8 @@ class TIntermConstantUnion : public TIntermTyped
    virtual void traverse(TIntermTraverser *);
    virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; }
-    TIntermTyped *fold(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink);
+    TConstantUnion *foldBinary(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink);
+    TIntermTyped *foldUnary(TOperator op, TInfoSink &infoSink);
    static TIntermTyped *FoldAggregateBuiltIn(TOperator op, TIntermAggregate *aggregate, TInfoSink &infoSink);
@@ -362,6 +363,7 @@ class TIntermBinary : public TIntermOperator
    TIntermTyped *getLeft() const { return mLeft; }
    TIntermTyped *getRight() const { return mRight; }
    bool promote(TInfoSink &);
+    TIntermTyped *fold(TInfoSink &infoSink);
    void setAddIndexClamp() { mAddIndexClamp = true; }
    bool getAddIndexClamp() { return mAddIndexClamp; }

--- a/src/compiler/translator/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -57,19 +57,10 @@ TIntermTyped *TIntermediate::addBinaryMath(
    if (!node->promote(mInfoSink))
        return NULL;
-    //
    // See if we can fold constants.
-    //
+    TIntermTyped *foldedNode = node->fold(mInfoSink);
-    TIntermConstantUnion *leftTempConstant = left->getAsConstantUnion();
+    if (foldedNode)
-    TIntermConstantUnion *rightTempConstant = right->getAsConstantUnion();
+        return foldedNode;
-    if (leftTempConstant && rightTempConstant)
-    {
-        TIntermTyped *typedReturnNode =
-            leftTempConstant->fold(node->getOp(), rightTempConstant, mInfoSink);
-        if (typedReturnNode)
-            return typedReturnNode;
-    }
    return node;
 }
@@ -143,7 +134,7 @@ TIntermTyped *TIntermediate::addUnaryMath(
    if (childTempConstant)
    {
-        TIntermTyped *newChild = childTempConstant->fold(op, nullptr, mInfoSink);
+        TIntermTyped *newChild = childTempConstant->foldUnary(op, mInfoSink);
        if (newChild)
            return newChild;