Remove createAssign: only called once

This will make it easier to add tracking of static reads. BUG=angleproject:2262 TEST=angle_unittests Change-Id: I23e0587c022c45ac62434a2a0d8170e8978d1c24 Reviewed-on: https://chromium-review.googlesource.com/983916Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Remove createAssign: only called once
7b7d2e6a · Olli Etuaho · Commit Bot · 78c5eb2a · 7b7d2e6a · 7b7d2e6a
Commit 7b7d2e6a authored Mar 23, 2018 by Olli Etuaho Committed by Commit Bot Mar 28, 2018
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 21 deletions

ParseContext.cpp src/compiler/translator/ParseContext.cpp +10 -17

ParseContext.h src/compiler/translator/ParseContext.h +0 -4

No files found.
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -5327,41 +5327,34 @@ TIntermTyped *TParseContext::addBinaryMathBooleanResult(TOperator op,
    return node;
 }
-TIntermBinary *TParseContext::createAssign(TOperator op,
+TIntermTyped *TParseContext::addAssign(TOperator op,
                                       TIntermTyped *left,
                                       TIntermTyped *right,
                                       const TSourceLoc &loc)
 {
+    checkCanBeLValue(loc, "assign", left);
+    TIntermBinary *node = nullptr;
    if (binaryOpCommonCheck(op, left, right, loc))
    {
        if (op == EOpMulAssign)
        {
            op = TIntermBinary::GetMulAssignOpBasedOnOperands(left->getType(), right->getType());
-            if (!isMultiplicationTypeCombinationValid(op, left->getType(), right->getType()))
+            if (isMultiplicationTypeCombinationValid(op, left->getType(), right->getType()))
            {
-                return nullptr;
+                node = new TIntermBinary(op, left, right);
            }
        }
-        TIntermBinary *node = new TIntermBinary(op, left, right);
+        else
-        node->setLine(loc);
+        {
+            node = new TIntermBinary(op, left, right);
-        return node;
+        }
    }
-    return nullptr;
-}
-TIntermTyped *TParseContext::addAssign(TOperator op,
-                                       TIntermTyped *left,
-                                       TIntermTyped *right,
-                                       const TSourceLoc &loc)
-{
-    checkCanBeLValue(loc, "assign", left);
-    TIntermTyped *node = createAssign(op, left, right, loc);
    if (node == nullptr)
    {
        assignError(loc, "assign", left->getCompleteString(), right->getCompleteString());
        return left;
    }
+    node->setLine(loc);
    return node;
 }

--- a/src/compiler/translator/ParseContext.h
+++ b/src/compiler/translator/ParseContext.h
@@ -545,10 +545,6 @@ class TParseContext : angle::NonCopyable
                                        TIntermTyped *left,
                                        TIntermTyped *right,
                                        const TSourceLoc &loc);
-    TIntermBinary *createAssign(TOperator op,
-                                TIntermTyped *left,
-                                TIntermTyped *right,
-                                const TSourceLoc &loc);
    TIntermTyped *createUnaryMath(TOperator op, TIntermTyped *child, const TSourceLoc &loc);
    TIntermTyped *addMethod(TFunctionLookup *fnCall, const TSourceLoc &loc);