JIT: Check for call interference when placing PUTARG nodes

Fix dotnet#103300
VSadov · Jun 24, 2024 · 27a707c · 27a707c
1 parent a05d762
commit 27a707c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/coreclr/jit/lower.cpp b/src/coreclr/jit/lower.cpp
@@ -1495,7 +1495,16 @@ bool Lowering::TryLowerSwitchToBitTest(FlowEdge*   jumpTable[],
     return true;
 }
 
-void Lowering::ReplaceArgWithPutArgOrBitcast(GenTree** argSlot, GenTree* putArgOrBitcast)
+//------------------------------------------------------------------------
+// ReplaceArgWithPutArgOrBitcast: Insert a PUTARG_* node in the right location
+// and replace the call operand with that node.
+//
+// Arguments:
+//    call            - the call whose arg is being rewritten.
+//    argSlot         - slot in call of argument
+//    putArgOrBitcast - the node that is being inserted
+//
+void Lowering::ReplaceArgWithPutArgOrBitcast(GenTreeCall* call, GenTree** argSlot, GenTree* putArgOrBitcast)
 {
     assert(argSlot != nullptr);
     assert(*argSlot != nullptr);
@@ -1508,7 +1517,24 @@ void Lowering::ReplaceArgWithPutArgOrBitcast(GenTree** argSlot, GenTree* putArgO
     putArgOrBitcast->AsOp()->gtOp1 = arg;
 
     // Insert the putarg/copy into the block
-    BlockRange().InsertAfter(arg, putArgOrBitcast);
+    bool interferingCall = false;
+    for (GenTree* cur = arg->gtNext; cur != call; cur = cur->gtNext)
+    {
+        if (cur->IsCall())
+        {
+            interferingCall = true;
+            break;
+        }
+    }
+
+    if (interferingCall)
+    {
+        BlockRange().InsertBefore(call, putArgOrBitcast);
+    }
+    else
+    {
+        BlockRange().InsertAfter(arg, putArgOrBitcast);
+    }
 }
 
 //------------------------------------------------------------------------
@@ -1622,7 +1648,7 @@ GenTree* Lowering::NewPutArg(GenTreeCall* call, GenTree* arg, CallArg* callArg,
                     GenTree* newOper = comp->gtNewPutArgReg(curTyp, curOp, argReg);
 
                     // Splice in the new GT_PUTARG_REG node in the GT_FIELD_LIST
-                    ReplaceArgWithPutArgOrBitcast(&use.NodeRef(), newOper);
+                    ReplaceArgWithPutArgOrBitcast(call, &use.NodeRef(), newOper);
                     regIndex++;
                 }
 
@@ -1844,7 +1870,7 @@ void Lowering::LowerArg(GenTreeCall* call, CallArg* callArg, bool late)
         // If an extra node is returned, splice it in the right place in the tree.
         if (arg != putArg)
         {
-            ReplaceArgWithPutArgOrBitcast(ppArg, putArg);
+            ReplaceArgWithPutArgOrBitcast(call, ppArg, putArg);
         }
     }
 
@@ -1895,7 +1921,7 @@ GenTree* Lowering::LowerFloatArg(GenTree** pArg, CallArg* callArg)
                     GenTree* intNode = LowerFloatArgReg(node, currRegNumber);
                     assert(intNode != nullptr);
 
-                    ReplaceArgWithPutArgOrBitcast(&use.NodeRef(), intNode);
+                    ReplaceArgWithPutArgOrBitcast(call, &use.NodeRef(), intNode);
                 }
 
                 if (node->TypeGet() == TYP_DOUBLE)
@@ -1916,7 +1942,7 @@ GenTree* Lowering::LowerFloatArg(GenTree** pArg, CallArg* callArg)
         {
             GenTree* intNode = LowerFloatArgReg(arg, callArg->AbiInfo.GetRegNum());
             assert(intNode != nullptr);
-            ReplaceArgWithPutArgOrBitcast(pArg, intNode);
+            ReplaceArgWithPutArgOrBitcast(call, pArg, intNode);
             return *pArg;
         }
     }

diff --git a/src/coreclr/jit/lower.h b/src/coreclr/jit/lower.h
@@ -179,7 +179,7 @@ class Lowering final : public Phase
     GenTree* LowerVirtualVtableCall(GenTreeCall* call);
     GenTree* LowerVirtualStubCall(GenTreeCall* call);
     void     LowerArgsForCall(GenTreeCall* call);
-    void     ReplaceArgWithPutArgOrBitcast(GenTree** ppChild, GenTree* newNode);
+    void     ReplaceArgWithPutArgOrBitcast(GenTreeCall* call, GenTree** ppChild, GenTree* newNode);
     GenTree* NewPutArg(GenTreeCall* call, GenTree* arg, CallArg* callArg, var_types type);
     void     LowerArg(GenTreeCall* call, CallArg* callArg, bool late);
 #if defined(TARGET_ARMARCH) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)