ES31: Use deepCopy to make sure that every node being used only once

This patch uses deepCopy for nodes which are used more than once in the SSBO traverser. Bug: angleproject:1951 Change-Id: Ie8e03d4f595484a1e2ca0397ed30a7f484add607 Reviewed-on: https://chromium-review.googlesource.com/c/1370678Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jiajia Qin <jiajia.qin@intel.com>

ES31: Use deepCopy to make sure that every node being used only once
a48f26fb · Qin Jiajia · Commit Bot · 3a256228 · a48f26fb
Commit a48f26fb authored Dec 11, 2018 by Qin Jiajia Committed by Commit Bot Dec 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

RewriteExpressionsWithShaderStorageBlock.cpp ...tor/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp +8 -7

No files found.
--- a/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
+++ b/src/compiler/translator/tree_ops/RewriteExpressionsWithShaderStorageBlock.cpp
@@ -174,21 +174,21 @@ bool RewriteExpressionsWithShaderStorageBlockTraverser::visitBinary(Visit visit,
        if (leftSSBO)
        {
            TIntermSymbol *tempSymbol =
-                insertInitStatementAndReturnTempSymbol(node->getLeft(), &insertions);
+                insertInitStatementAndReturnTempSymbol(node->getLeft()->deepCopy(), &insertions);
            TIntermBinary *tempCompoundOperate =
-                new TIntermBinary(node->getOp(), tempSymbol, rightNode);
+                new TIntermBinary(node->getOp(), tempSymbol->deepCopy(), rightNode->deepCopy());
            insertions.push_back(tempCompoundOperate);
            insertStatementsInParentBlock(insertions);

            TIntermBinary *assignTempValueToSSBO =
-                new TIntermBinary(EOpAssign, node->getLeft(), tempSymbol);
+                new TIntermBinary(EOpAssign, node->getLeft(), tempSymbol->deepCopy());
            queueReplacement(assignTempValueToSSBO, OriginalNode::IS_DROPPED);
        }
        else
        {
            insertStatementsInParentBlock(insertions);
            TIntermBinary *compoundAssignRValueToLValue =
-                new TIntermBinary(node->getOp(), node->getLeft(), rightNode);
+                new TIntermBinary(node->getOp(), node->getLeft(), rightNode->deepCopy());
            queueReplacement(compoundAssignRValueToLValue, OriginalNode::IS_DROPPED);
        }
    }
@@ -216,7 +216,8 @@ bool RewriteExpressionsWithShaderStorageBlockTraverser::visitBinary(Visit visit,
        }

        insertStatementsInParentBlock(insertions);
-        TIntermBinary *newExpr = new TIntermBinary(node->getOp(), leftNode, rightNode);
+        TIntermBinary *newExpr =
+            new TIntermBinary(node->getOp(), leftNode->deepCopy(), rightNode->deepCopy());
        queueReplacement(newExpr, OriginalNode::IS_DROPPED);
    }
    return !mFoundSSBO;
@@ -282,7 +283,7 @@ bool RewriteExpressionsWithShaderStorageBlockTraverser::visitAggregate(Visit vis
                    readBackToSSBOs.push_back(readBackToSSBO);
                }
            }
-            node->replaceChildNode(ssboArgument, argumentCopy);
+            node->replaceChildNode(ssboArgument->deepCopy(), argumentCopy);
        }
    }

@@ -306,7 +307,7 @@ bool RewriteExpressionsWithShaderStorageBlockTraverser::visitAggregate(Visit vis
            insertions.insert(insertions.end(), readBackToSSBOs.begin(), readBackToSSBOs.end());
        }
        insertStatementsInParentBlock(insertions);
-        queueReplacement(tempSymbol, OriginalNode::IS_DROPPED);
+        queueReplacement(tempSymbol->deepCopy(), OriginalNode::IS_DROPPED);
    }

    return false;