JIT: Avoid overriding argument register with 'jmp' epilog (#114899)

jakobbotsch · web-flow · commit 1a8fd540172a · 2025-04-23T10:39:46.000+02:00
diff --git a/src/coreclr/jit/codegenxarch.cpp b/src/coreclr/jit/codegenxarch.cpp
@@ -10643,7 +10643,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)
                 // do nothing before popping the callee-saved registers
             }
 #ifdef TARGET_X86
-            else if (compiler->compLclFrameSize == REGSIZE_BYTES)
+            else if ((compiler->compLclFrameSize == REGSIZE_BYTES) && !compiler->compJmpOpUsed)
             {
                 // "pop ecx" will make ESP point to the callee-saved registers
                 inst_RV(INS_pop, REG_ECX, TYP_I_IMPL);

Original file line number	Diff line number	Diff line change
`@@ -10643,7 +10643,7 @@ void CodeGen::genFnEpilog(BasicBlock* block)`
`10643`	`10643`	`// do nothing before popping the callee-saved registers`
`10644`	`10644`	`}`
`10645`	`10645`	`#ifdef TARGET_X86`
`10646`		`- else if (compiler->compLclFrameSize == REGSIZE_BYTES)`
	`10646`	`+ else if ((compiler->compLclFrameSize == REGSIZE_BYTES) && !compiler->compJmpOpUsed)`
`10647`	`10647`	`{`
`10648`	`10648`	`// "pop ecx" will make ESP point to the callee-saved registers`
`10649`	`10649`	`inst_RV(INS_pop, REG_ECX, TYP_I_IMPL);`