@@ -4903,7 +4903,6 @@ static void SetIndirectStoreEvalOrder(Compiler* comp, GenTreeIndir* store, bool*
49034903 * 1. GetCostEx() to the execution complexity estimate
49044904 * 2. GetCostSz() to the code size estimate
49054905 * 3. Sometimes sets GTF_ADDRMODE_NO_CSE on nodes in the tree.
4906- * 4. DEBUG-only: clears GTF_DEBUG_NODE_MORPHED.
49074906 */
49084907
49094908#ifdef _PREFAST_
@@ -14388,10 +14387,7 @@ GenTree* Compiler::gtFoldExprSpecial(GenTree* tree)
1438814387 // Helper function that creates a new IntCon node and morphs it, if required
1438914388 auto NewMorphedIntConNode = [&](int value) -> GenTreeIntCon* {
1439014389 GenTreeIntCon* icon = gtNewIconNode(value);
14391- if (fgGlobalMorph)
14392- {
14393- INDEBUG(icon->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
14394- }
14390+ icon->SetMorphed(this);
1439514391 return icon;
1439614392 };
1439714393
@@ -14402,18 +14398,14 @@ GenTree* Compiler::gtFoldExprSpecial(GenTree* tree)
1440214398 assert(varTypeIsUnsigned(castToType));
1440314399
1440414400 GenTreeCast* cast = gtNewCastNode(TYP_INT, op1, false, castToType);
14405- if (fgGlobalMorph)
14406- {
14407- fgMorphTreeDone(cast);
14408- }
14401+ cast->SetMorphed(this);
14402+ fgMorphTreeDone(cast);
1440914403
1441014404 if (type == TYP_LONG)
1441114405 {
1441214406 cast = gtNewCastNode(TYP_LONG, cast, true, TYP_LONG);
14413- if (fgGlobalMorph)
14414- {
14415- fgMorphTreeDone(cast);
14416- }
14407+ cast->SetMorphed(this);
14408+ fgMorphTreeDone(cast);
1441714409 }
1441814410
1441914411 return cast;
@@ -14680,14 +14672,7 @@ GenTree* Compiler::gtFoldExprSpecial(GenTree* tree)
1468014672 DISPTREE(tree);
1468114673 JITDUMP("Transformed into:\n");
1468214674 DISPTREE(op);
14683-
14684- if (fgGlobalMorph)
14685- {
14686- // We can sometimes produce a comma over the constant if the original op
14687- // had a side effect, so just ensure we set the flag (which will be already
14688- // set for the operands otherwise).
14689- INDEBUG(op->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
14690- }
14675+ op->SetMorphed(this);
1469114676 return op;
1469214677}
1469314678
@@ -14742,10 +14727,9 @@ GenTree* Compiler::gtFoldExprSpecialFloating(GenTree* tree)
1474214727 // Helper function that creates a new IntCon node and morphs it, if required
1474314728 auto NewMorphedIntConNode = [&](int value) -> GenTreeIntCon* {
1474414729 GenTreeIntCon* icon = gtNewIconNode(value);
14745- if (fgGlobalMorph)
14746- {
14747- INDEBUG(icon->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
14748- }
14730+
14731+ icon->SetMorphed(this);
14732+
1474914733 return icon;
1475014734 };
1475114735
@@ -14907,14 +14891,8 @@ GenTree* Compiler::gtFoldExprSpecialFloating(GenTree* tree)
1490714891 DISPTREE(tree);
1490814892 JITDUMP("Transformed into:\n");
1490914893 DISPTREE(op);
14894+ op->SetMorphed(this);
1491014895
14911- if (fgGlobalMorph)
14912- {
14913- // We can sometimes produce a comma over the constant if the original op
14914- // had a side effect, so just ensure we set the flag (which will be already
14915- // set for the operands otherwise).
14916- INDEBUG(op->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
14917- }
1491814896 return op;
1491914897}
1492014898
@@ -15435,6 +15413,11 @@ GenTree* Compiler::gtOptimizeEnumHasFlag(GenTree* thisOp, GenTree* flagOp)
1543515413 Statement* thisStoreStmt = thisOp->AsBox()->gtCopyStmtWhenInlinedBoxValue;
1543615414 thisStoreStmt->SetRootNode(thisStore);
1543715415 thisValOpt = gtNewLclvNode(thisTmp, type);
15416+
15417+ // If this is invoked during global morph we are adding code to a remote tree
15418+ // Despite this being a store, we can't meaningfully add assertions
15419+ //
15420+ thisStore->SetMorphed(this);
1543815421 }
1543915422
1544015423 if (flagVal->IsIntegralConst())
@@ -15452,6 +15435,11 @@ GenTree* Compiler::gtOptimizeEnumHasFlag(GenTree* thisOp, GenTree* flagOp)
1545215435 flagStoreStmt->SetRootNode(flagStore);
1545315436 flagValOpt = gtNewLclvNode(flagTmp, type);
1545415437 flagValOptCopy = gtNewLclvNode(flagTmp, type);
15438+
15439+ // If this is invoked during global morph we are adding code to a remote tree
15440+ // Despite this being a store, we can't meaningfully add assertions
15441+ //
15442+ flagStore->SetMorphed(this);
1545515443 }
1545615444
1545715445 // Turn the call into (thisValTmp & flagTmp) == flagTmp.
@@ -17436,16 +17424,7 @@ void Compiler::gtExtractSideEffList(GenTree* expr,
1743617424 }
1743717425
1743817426 GenTree* comma = m_compiler->gtNewOperNode(GT_COMMA, TYP_VOID, m_result, node);
17439-
17440- #ifdef DEBUG
17441- if (m_compiler->fgGlobalMorph)
17442- {
17443- // Either both should be morphed or neither should be.
17444- assert((m_result->gtDebugFlags & GTF_DEBUG_NODE_MORPHED) ==
17445- (node->gtDebugFlags & GTF_DEBUG_NODE_MORPHED));
17446- comma->gtDebugFlags |= node->gtDebugFlags & GTF_DEBUG_NODE_MORPHED;
17447- }
17448- #endif
17427+ comma->SetMorphed(m_compiler);
1744917428
1745017429 // Both should have valuenumbers defined for both or for neither
1745117430 // one (unless we are remorphing, in which case a prior transform
@@ -30763,12 +30742,7 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree)
3076330742 }
3076430743
3076530744 vecCon->gtSimdVal = simdVal;
30766-
30767- if (fgGlobalMorph)
30768- {
30769- INDEBUG(vecCon->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
30770- }
30771-
30745+ vecCon->SetMorphed(this);
3077230746 fgUpdateConstTreeValueNumber(vecCon);
3077330747 return vecCon;
3077430748 }
@@ -30830,11 +30804,7 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree)
3083030804#endif // !TARGET_XARCH && !TARGET_ARM64
3083130805
3083230806 DEBUG_DESTROY_NODE(op, tree);
30833-
30834- if (fgGlobalMorph)
30835- {
30836- INDEBUG(vectorNode->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
30837- }
30807+ vectorNode->SetMorphed(this);
3083830808 return vectorNode;
3083930809 }
3084030810 }
@@ -32019,17 +31989,10 @@ GenTree* Compiler::gtFoldExprHWIntrinsic(GenTreeHWIntrinsic* tree)
3201931989
3202031990 if (resultNode != tree)
3202131991 {
32022- if (fgGlobalMorph)
31992+ resultNode->SetMorphed(this);
31993+ if (resultNode->OperIs(GT_COMMA))
3202331994 {
32024- // We can sometimes produce a comma over the constant if the original op
32025- // had a side effect or even a new constant node, so just ensure we set
32026- // the flag (which will be already set for the operands otherwise).
32027- INDEBUG(resultNode->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
32028-
32029- if (resultNode->OperIs(GT_COMMA))
32030- {
32031- INDEBUG(resultNode->AsOp()->gtGetOp2()->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED);
32032- }
31995+ resultNode->AsOp()->gtGetOp2()->SetMorphed(this);
3203331996 }
3203431997
3203531998 if (resultNode->OperIsConst())
@@ -32156,3 +32119,65 @@ bool Compiler::gtCanSkipCovariantStoreCheck(GenTree* value, GenTree* array)
3215632119
3215732120 return false;
3215832121}
32122+
32123+ #if defined(DEBUG)
32124+ //------------------------------------------------------------------------
32125+ // SetMorphed: mark a node as having been morphed
32126+ //
32127+ // Arguments:
32128+ // compiler - compiler instance
32129+ // doChildren - recursive mark child nodes
32130+ //
32131+ // Notes:
32132+ // Does nothing outside of global morph.
32133+ //
32134+ // Useful for morph post-order expansions / optimizations.
32135+ //
32136+ // Use care when invoking this on an assignment (or when doChildren is true,
32137+ // on trees containing assignments) as those usually will also require
32138+ // local assertion updates.
32139+ //
32140+ void GenTree::SetMorphed(Compiler* compiler, bool doChildren /* = false */)
32141+ {
32142+ if (!compiler->fgGlobalMorph)
32143+ {
32144+ return;
32145+ }
32146+
32147+ struct Visitor : GenTreeVisitor<Visitor>
32148+ {
32149+ enum
32150+ {
32151+ DoPostOrder = true,
32152+ };
32153+
32154+ Visitor(Compiler* comp)
32155+ : GenTreeVisitor(comp)
32156+ {
32157+ }
32158+
32159+ fgWalkResult PostOrderVisit(GenTree** use, GenTree* user)
32160+ {
32161+ GenTree* const node = *use;
32162+ if (!node->WasMorphed())
32163+ {
32164+ node->gtDebugFlags |= GTF_DEBUG_NODE_MORPHED;
32165+ node->gtMorphCount++;
32166+ }
32167+ return Compiler::WALK_CONTINUE;
32168+ }
32169+ };
32170+
32171+ if (doChildren)
32172+ {
32173+ Visitor v(compiler);
32174+ GenTree* node = this;
32175+ v.WalkTree(&node, nullptr);
32176+ }
32177+ else if (!WasMorphed())
32178+ {
32179+ gtDebugFlags |= GTF_DEBUG_NODE_MORPHED;
32180+ gtMorphCount++;
32181+ }
32182+ }
32183+ #endif
0 commit comments