uniform ARM64's OSR offset to LA64/RV64.

Author: shushanhf

src/coreclr/jit/codegencommon.cpp

@@ -4086,39 +4086,7 @@ void CodeGen::genEnregisterOSRArgsAndLocals()
 
         GetEmitter()->emitIns_R_AR(ins_Load(lclTyp), size, varDsc->GetRegNum(), genFramePointerReg(), offset);
 
-#elif defined(TARGET_ARM64)
-
-        // Patchpoint offset is from top of Tier0 frame
-        //
-        // We need to determine the frame-pointer relative
-        // offset for this variable in the osr frame.
-        //
-        // First add the Tier0 frame size
-        //
-        const int tier0FrameSize = compiler->info.compPatchpointInfo->TotalFrameSize();
-
-        // then add the OSR frame size
-        //
-        const int osrFrameSize = genTotalFrameSize();
-
-        // then subtract OSR SP-FP delta
-        //
-        const int osrSpToFpDelta = genSPtoFPdelta();
-
-        //               | => tier0 top of frame relative
-        //               |         + => tier0 bottom of frame relative
-        //               |         |                + => osr bottom of frame (sp) relative
-        //               |         |                |              - => osr fp relative
-        //               |         |                |              |
-        const int offset = stkOffs + tier0FrameSize + osrFrameSize - osrSpToFpDelta;
-
-        JITDUMP("---OSR--- V%02u (reg) Tier0 virtual offset %d OSR frame size %d OSR sp-fp "
-                "delta %d total offset %d (0x%x)\n",
-                varNum, stkOffs, osrFrameSize, osrSpToFpDelta, offset, offset);
-
-        genInstrWithConstant(ins_Load(lclTyp), size, varDsc->GetRegNum(), genFramePointerReg(), offset, initReg);
-        *pInitRegZeroed = false;
-#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
+#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64) || defined(TARGET_ARM64)
 
         // Patchpoint offset is from top of Tier0 frame
         //

src/coreclr/jit/compiler.cpp

@@ -5834,13 +5834,7 @@ void Compiler::generatePatchpointInfo()
     //
     const int totalFrameSize = codeGen->genTotalFrameSize() + TARGET_POINTER_SIZE;
     const int offsetAdjust   = 0;
-#elif defined(TARGET_ARM64)
-    // SP is not manipulated by calls so no frame size adjustment needed.
-    // Local Offsets may need adjusting, if FP is at bottom of frame.
-    //
-    const int totalFrameSize = codeGen->genTotalFrameSize();
-    const int offsetAdjust   = codeGen->genSPtoFPdelta() - totalFrameSize;
-#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
+#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64) || defined(TARGET_ARM64)
     // SP is not manipulated by calls so no frame size adjustment needed.
     // Local Offsets are adjusted which relative to SP.
     //

src/coreclr/jit/lclvars.cpp

@@ -5709,12 +5709,12 @@ void Compiler::lvaFixVirtualFrameOffsets()
 
     if (opts.IsOSR())
     {
-#if defined(TARGET_AMD64) || defined(TARGET_ARM64)
+#if defined(TARGET_AMD64)
         // Stack offset includes Tier0 frame.
         //
         JITDUMP("--- delta bump %d for OSR + Tier0 frame\n", info.compPatchpointInfo->TotalFrameSize());
         delta += info.compPatchpointInfo->TotalFrameSize();
-#endif // TARGET_AMD64 || TARGET_ARM64
+#endif // TARGET_AMD64
     }
 
     JITDUMP("--- virtual stack offset to actual stack offset delta is %d\n", delta);
@@ -6565,20 +6565,16 @@ void Compiler::lvaAssignVirtualFrameOffsetsToLocals()
     {
         lvaTable[lvaRetAddrVar].SetStackOffset(stkOffs);
     }
-#endif
 
     // If we are an OSR method, we "inherit" the frame of the original method
     //
     if (opts.IsOSR())
     {
-#if !defined(TARGET_LOONGARCH64) && !defined(TARGET_RISCV64)
         originalFrameSize    = info.compPatchpointInfo->TotalFrameSize();
         originalFrameStkOffs = stkOffs;
         stkOffs -= originalFrameSize;
-#endif
     }
 
-#ifdef TARGET_XARCH
     // TODO-AMD64-CQ: for X64 eventually this should be pushed with all the other
     // calleeregs.  When you fix this, you'll also need to fix
     // the assert at the bottom of this method