Simplify queueReplacement AST transform helper

src/compiler/translator/ArrayReturnValueToOutParameter.cpp

@@ -117,7 +117,7 @@ bool ArrayReturnValueToOutParameterTraverser::visitFunctionPrototype(Visit visit
         *replacement->getFunctionSymbolInfo() = *node->getFunctionSymbolInfo();
         replacement->setLine(node->getLine());
 
-        queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+        queueReplacement(replacement, OriginalNode::IS_DROPPED);
     }
     return false;
 }
@@ -186,7 +186,7 @@ bool ArrayReturnValueToOutParameterTraverser::visitBinary(Visit visit, TIntermBi
         if (rightAgg != nullptr && rightAgg->getOp() == EOpCallFunctionInAST)
         {
             TIntermAggregate *replacementCall = CreateReplacementCall(rightAgg, node->getLeft());
-            queueReplacement(node, replacementCall, OriginalNode::IS_DROPPED);
+            queueReplacement(replacementCall, OriginalNode::IS_DROPPED);
         }
     }
     return false;

src/compiler/translator/DeclareAndInitBuiltinsForInstancedMultiview.cpp

@@ -33,7 +33,7 @@ class ReplaceVariableTraverser : public TIntermTraverser
         TName &name = node->getName();
         if (name.getString() == mSymbolName)
         {
-            queueReplacement(node, mNewSymbol->deepCopy(), OriginalNode::IS_DROPPED);
+            queueReplacement(mNewSymbol->deepCopy(), OriginalNode::IS_DROPPED);
         }
     }
 

src/compiler/translator/EmulateGLFragColorBroadcast.cpp

@@ -71,7 +71,7 @@ void GLFragColorBroadcastTraverser::visitSymbol(TIntermSymbol *node)
 {
     if (node->getSymbol() == "gl_FragColor")
     {
-        queueReplacement(node, constructGLFragDataNode(0), OriginalNode::IS_DROPPED);
+        queueReplacement(constructGLFragDataNode(0), OriginalNode::IS_DROPPED);
         mGLFragColorUsed = true;
     }
 }

src/compiler/translator/EmulatePrecision.cpp

@@ -527,7 +527,7 @@ void EmulatePrecision::visitSymbol(TIntermSymbol *node)
         !isLValueRequiredHere())
     {
         TIntermNode *replacement = createRoundingFunctionCallNode(node);
-        queueReplacement(node, replacement, OriginalNode::BECOMES_CHILD);
+        queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
     }
 }
 
@@ -575,7 +575,7 @@ bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
                     break;
                 }
                 TIntermNode *replacement = createRoundingFunctionCallNode(node);
-                queueReplacement(node, replacement, OriginalNode::BECOMES_CHILD);
+                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
                 break;
             }
 
@@ -587,7 +587,7 @@ bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
                              node->getRight()->getType().getBuiltInTypeNameString()));
                 TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
                     node->getLeft(), node->getRight(), "add");
-                queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
                 break;
             }
             case EOpSubAssign:
@@ -597,7 +597,7 @@ bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
                              node->getRight()->getType().getBuiltInTypeNameString()));
                 TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
                     node->getLeft(), node->getRight(), "sub");
-                queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
                 break;
             }
             case EOpMulAssign:
@@ -611,7 +611,7 @@ bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
                              node->getRight()->getType().getBuiltInTypeNameString()));
                 TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
                     node->getLeft(), node->getRight(), "mul");
-                queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
                 break;
             }
             case EOpDivAssign:
@@ -621,7 +621,7 @@ bool EmulatePrecision::visitBinary(Visit visit, TIntermBinary *node)
                              node->getRight()->getType().getBuiltInTypeNameString()));
                 TIntermNode *replacement = createCompoundAssignmentFunctionCallNode(
                     node->getLeft(), node->getRight(), "div");
-                queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+                queueReplacement(replacement, OriginalNode::IS_DROPPED);
                 break;
             }
             default:
@@ -682,7 +682,7 @@ bool EmulatePrecision::visitAggregate(Visit visit, TIntermAggregate *node)
                 !ParentConstructorTakesCareOfRounding(parent, node))
             {
                 TIntermNode *replacement = createRoundingFunctionCallNode(node);
-                queueReplacement(node, replacement, OriginalNode::BECOMES_CHILD);
+                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
             }
             break;
     }
@@ -705,7 +705,7 @@ bool EmulatePrecision::visitUnary(Visit visit, TIntermUnary *node)
             if (canRoundFloat(node->getType()) && visit == PreVisit)
             {
                 TIntermNode *replacement = createRoundingFunctionCallNode(node);
-                queueReplacement(node, replacement, OriginalNode::BECOMES_CHILD);
+                queueReplacement(replacement, OriginalNode::BECOMES_CHILD);
             }
             break;
     }

src/compiler/translator/ExpandIntegerPowExpressions.cpp

@@ -139,7 +139,7 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
         current                       = div;
     }
 
-    queueReplacement(node, current, OriginalNode::IS_DROPPED);
+    queueReplacement(current, OriginalNode::IS_DROPPED);
     mFound = true;
     return false;
 }

src/compiler/translator/IntermTraverse.cpp

@@ -699,11 +699,9 @@ void TIntermTraverser::clearReplacementQueue()
     mInsertions.clear();
 }
 
-void TIntermTraverser::queueReplacement(TIntermNode *original,
-                                        TIntermNode *replacement,
-                                        OriginalNode originalStatus)
+void TIntermTraverser::queueReplacement(TIntermNode *replacement, OriginalNode originalStatus)
 {
-    queueReplacementWithParent(getParentNode(), original, replacement, originalStatus);
+    queueReplacementWithParent(getParentNode(), mPath.back(), replacement, originalStatus);
 }
 
 void TIntermTraverser::queueReplacementWithParent(TIntermNode *parent,

src/compiler/translator/IntermTraverse.h

@@ -236,9 +236,10 @@ class TIntermTraverser : angle::NonCopyable
     };
 
     void clearReplacementQueue();
-    void queueReplacement(TIntermNode *original,
-                          TIntermNode *replacement,
-                          OriginalNode originalStatus);
+
+    // Replace the node currently being visited with replacement.
+    void queueReplacement(TIntermNode *replacement, OriginalNode originalStatus);
+    // Explicitly specify a node to replace with replacement.
     void queueReplacementWithParent(TIntermNode *parent,
                                     TIntermNode *original,
                                     TIntermNode *replacement,

src/compiler/translator/PruneEmptyDeclarations.cpp

@@ -76,7 +76,7 @@ bool PruneEmptyDeclarationsTraverser::visitDeclaration(Visit, TIntermDeclaration
                 }
                 else
                 {
-                    queueReplacement(node, nullptr, OriginalNode::IS_DROPPED);
+                    queueReplacement(nullptr, OriginalNode::IS_DROPPED);
                 }
             }
             else if (sym->getType().getQualifier() != EvqGlobal &&

src/compiler/translator/RecordConstantPrecision.cpp

@@ -139,7 +139,7 @@ void RecordConstantPrecisionTraverser::visitConstantUnion(TIntermConstantUnion *
     TIntermSequence insertions;
     insertions.push_back(createTempInitDeclaration(node, EvqConst));
     insertStatementsInParentBlock(insertions);
-    queueReplacement(node, createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
+    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
     mFoundHigherPrecisionConstant = true;
 }
 

src/compiler/translator/RemoveDynamicIndexing.cpp

@@ -493,7 +493,7 @@ bool RemoveDynamicIndexingTraverser::visitBinary(Visit visit, TIntermBinary *nod
                     node, tempIndex, createTempSymbol(fieldType), indexedWriteFunctionId);
                 insertionsAfter.push_back(indexedWriteCall);
                 insertStatementsInParentBlock(insertionsBefore, insertionsAfter);
-                queueReplacement(node, createTempSymbol(fieldType), OriginalNode::IS_DROPPED);
+                queueReplacement(createTempSymbol(fieldType), OriginalNode::IS_DROPPED);
                 mUsedTreeInsertion = true;
             }
             else
@@ -506,7 +506,7 @@ bool RemoveDynamicIndexingTraverser::visitBinary(Visit visit, TIntermBinary *nod
                 ASSERT(!mRemoveIndexSideEffectsInSubtree);
                 TIntermAggregate *indexingCall = CreateIndexFunctionCall(
                     node, EnsureSignedInt(node->getRight()), indexingFunctionId);
-                queueReplacement(node, indexingCall, OriginalNode::IS_DROPPED);
+                queueReplacement(indexingCall, OriginalNode::IS_DROPPED);
             }
         }
     }

src/compiler/translator/RemovePow.cpp

@@ -67,7 +67,7 @@ bool RemovePowTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
         TIntermUnary *exp = new TIntermUnary(EOpExp2, mul);
         exp->setLine(node->getLine());
 
-        queueReplacement(node, exp, OriginalNode::IS_DROPPED);
+        queueReplacement(exp, OriginalNode::IS_DROPPED);
 
         // If the x parameter also needs to be replaced, we need to do that in another traversal,
         // since it's parent node will change in a way that's not handled correctly by updateTree().

src/compiler/translator/RewriteTexelFetchOffset.cpp

@@ -139,7 +139,7 @@ bool Traverser::visitAggregate(Visit visit, TIntermAggregate *node)
     texelFetchNode->setLine(node->getLine());
 
     // Replace the old node by this new node.
-    queueReplacement(node, texelFetchNode, OriginalNode::IS_DROPPED);
+    queueReplacement(texelFetchNode, OriginalNode::IS_DROPPED);
     mFound = true;
     return false;
 }

src/compiler/translator/RewriteUnaryMinusOperatorFloat.cpp

@@ -77,7 +77,7 @@ bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
     TIntermBinary *sub = new TIntermBinary(EOpSub, zero, fValue);
     sub->setLine(fValue->getLine());
 
-    queueReplacement(node, sub, OriginalNode::IS_DROPPED);
+    queueReplacement(sub, OriginalNode::IS_DROPPED);
 
     mFound = true;
     return false;

src/compiler/translator/RewriteUnaryMinusOperatorInt.cpp

@@ -96,7 +96,7 @@ bool Traverser::visitUnary(Visit visit, TIntermUnary *node)
     TIntermBinary *add = new TIntermBinary(EOpAdd, bitwiseNot, oneNode);
     add->setLine(opr->getLine());
 
-    queueReplacement(node, add, OriginalNode::IS_DROPPED);
+    queueReplacement(add, OriginalNode::IS_DROPPED);
 
     mFound = true;
     return false;

src/compiler/translator/SeparateExpressionsReturningArrays.cpp

@@ -76,7 +76,7 @@ bool SeparateExpressionsTraverser::visitBinary(Visit visit, TIntermBinary *node)
     insertions.push_back(createTempInitDeclaration(node->getLeft()));
     insertStatementsInParentBlock(insertions);
 
-    queueReplacement(node, createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
+    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
 
     return false;
 }
@@ -97,7 +97,7 @@ bool SeparateExpressionsTraverser::visitAggregate(Visit visit, TIntermAggregate
     insertions.push_back(createTempInitDeclaration(node->shallowCopy()));
     insertStatementsInParentBlock(insertions);
 
-    queueReplacement(node, createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
+    queueReplacement(createTempSymbol(node->getType()), OriginalNode::IS_DROPPED);
 
     return false;
 }

src/compiler/translator/SimplifyLoopConditions.cpp

@@ -264,7 +264,7 @@ void SimplifyLoopConditionsTraverser::traverseLoop(TIntermLoop *node)
                 ELoopWhile, nullptr, createTempSymbol(conditionInitializer->getType()), nullptr,
                 whileLoopBody);
             loopScope->getSequence()->push_back(whileLoop);
-            queueReplacement(node, loopScope, OriginalNode::IS_DROPPED);
+            queueReplacement(loopScope, OriginalNode::IS_DROPPED);
 
             // After this the old body node will be traversed and loops inside it may be
             // transformed. This is fine, since the old body node will still be in the AST after the

src/compiler/translator/SplitSequenceOperator.cpp

@@ -98,7 +98,7 @@ bool SplitSequenceOperatorTraverser::visitBinary(Visit visit, TIntermBinary *nod
                 insertions.push_back(node->getLeft());
                 insertStatementsInParentBlock(insertions);
                 // Replace the comma node with its right side operand.
-                queueReplacement(node, node->getRight(), OriginalNode::IS_DROPPED);
+                queueReplacement(node->getRight(), OriginalNode::IS_DROPPED);
             }
             mInsideSequenceOperator--;
         }

src/compiler/translator/UnfoldShortCircuitAST.cpp

@@ -51,7 +51,7 @@ bool UnfoldShortCircuitAST::visitBinary(Visit visit, TIntermBinary *node)
     }
     if (replacement)
     {
-        queueReplacement(node, replacement, OriginalNode::IS_DROPPED);
+        queueReplacement(replacement, OriginalNode::IS_DROPPED);
     }
     return true;
 }

src/compiler/translator/UnfoldShortCircuitToIf.cpp

@@ -90,7 +90,7 @@ bool UnfoldShortCircuitTraverser::visitBinary(Visit visit, TIntermBinary *node)
 
             insertStatementsInParentBlock(insertions);
 
-            queueReplacement(node, createTempSymbol(boolType), OriginalNode::IS_DROPPED);
+            queueReplacement(createTempSymbol(boolType), OriginalNode::IS_DROPPED);
             return false;
         }
         case EOpLogicalAnd:
@@ -114,7 +114,7 @@ bool UnfoldShortCircuitTraverser::visitBinary(Visit visit, TIntermBinary *node)
 
             insertStatementsInParentBlock(insertions);
 
-            queueReplacement(node, createTempSymbol(boolType), OriginalNode::IS_DROPPED);
+            queueReplacement(createTempSymbol(boolType), OriginalNode::IS_DROPPED);
             return false;
         }
         default:
@@ -157,7 +157,7 @@ bool UnfoldShortCircuitTraverser::visitTernary(Visit visit, TIntermTernary *node
     insertStatementsInParentBlock(insertions);
 
     TIntermSymbol *ternaryResult = createTempSymbol(node->getType());
-    queueReplacement(node, ternaryResult, OriginalNode::IS_DROPPED);
+    queueReplacement(ternaryResult, OriginalNode::IS_DROPPED);
 
     return false;
 }