revert IsSplitAcrossRegistersAndStack().

dotnet · Apr 29, 2024 · 78c4e25 · 78c4e25
1 parent 6bf9d17
commit 78c4e25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/coreclr/jit/abi.cpp b/src/coreclr/jit/abi.cpp
@@ -258,12 +258,21 @@ bool ABIPassingInformation::HasExactlyOneStackSegment() const
 //
 bool ABIPassingInformation::IsSplitAcrossRegistersAndStack() const
 {
-    if (NumSegments != 2)
+    if (NumSegments < 2)
     {
         return false;
     }
 
-    return Segments[0].IsPassedInRegister() && Segments[1].IsPassedOnStack();
+    bool isFirstInReg = Segments[0].IsPassedInRegister();
+    for (unsigned i = 1; i < NumSegments; i++)
+    {
+        if (isFirstInReg != Segments[i].IsPassedInRegister())
+        {
+            return true;
+        }
+        return false;
+    }
+    return false;
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp
@@ -4282,9 +4282,9 @@ void CodeGen::genHomeStackPartOfSplitParameter(regNumber initReg, bool* initRegS
 #ifdef DEBUG
             for (lclNum += 1; lclNum < compiler->info.compArgsCount; lclNum++)
             {
-                abiInfo = compiler->lvaGetParameterABIInfo(lclNum);
+                const ABIPassingInformation& abiInfo2 = compiler->lvaGetParameterABIInfo(lclNum);
                 // There should be only one split parameter
-                assert(!abiInfo.IsSplitAcrossRegistersAndStack());
+                assert(!abiInfo2.IsSplitAcrossRegistersAndStack());
             }
 #endif
             break;