Call genHomeStackParams(true) in prolog generation for RISC-V to avoi…

…d garbage GC pointers
tomeksowi · Apr 25, 2024 · 4806478 · 4806478
1 parent 5a0aede
commit 4806478
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/coreclr/jit/codegencommon.cpp b/src/coreclr/jit/codegencommon.cpp
@@ -5555,6 +5555,13 @@ void CodeGen::genFnProlog()
         genEnregisterIncomingStackArgs();
     }
 
+#ifdef TARGET_RISCV64
+    if (compiler->fgFirstBBisScratch() && compiler->lvaHasAnyStackParamToReassemble())
+    {
+        genHomeStackParams(/* handleStack */ true);
+    }
+#endif
+
     /* Initialize any must-init registers variables now */
 
     if (initRegs)

diff --git a/src/coreclr/jit/codegenlinear.cpp b/src/coreclr/jit/codegenlinear.cpp
@@ -386,7 +386,7 @@ void CodeGen::genCodeForBBlist()
         compiler->compCurStmt     = nullptr;
         compiler->compCurLifeTree = nullptr;
 
-#if defined(SWIFT_SUPPORT) || defined(TARGET_RISCV64)
+#ifdef SWIFT_SUPPORT
         // Reassemble split struct parameters on the local stack frame in the
         // scratch BB right after the prolog. There can be arbitrary amounts of
         // codegen related to doing this, so it cannot be done in the prolog.