Skip to content

Commit b78f2e0

Browse files
committed
amend the code for CRs.
1 parent e912cc5 commit b78f2e0

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/coreclr/jit/codegencommon.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4093,10 +4093,10 @@ void CodeGen::genEnregisterOSRArgsAndLocals()
40934093
// We need to determine the frame-pointer relative
40944094
// offset for this variable in the osr frame.
40954095
//
4096-
// First there is no need to ajust stkOffs
4097-
// as it relative to sp within Tier0 frame
4096+
// Note: there is no need to adjust stkOffs
4097+
// as it is relative to sp within Tier0 frame.
40984098

4099-
// then add the OSR frame size
4099+
// Add the OSR frame size.
41004100
//
41014101
const int osrFrameSize = genTotalFrameSize();
41024102

@@ -4116,7 +4116,7 @@ void CodeGen::genEnregisterOSRArgsAndLocals()
41164116

41174117
genInstrWithConstant(ins_Load(lclTyp), size, varDsc->GetRegNum(), genFramePointerReg(), offset, initReg);
41184118
*pInitRegZeroed = false;
4119-
#endif // TARGET_LOONGARCH64 || TARGET_RISCV64
4119+
#endif // TARGET_LOONGARCH64 || TARGET_RISCV64 || TARGET_ARM64
41204120
}
41214121
}
41224122

src/coreclr/jit/codegenloongarch64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ void CodeGen::genRestoreCalleeSavedRegistersHelp(regMaskTP regsToRestoreMask, in
691691
* |-----------------------|
692692
* | PSP slot | // 8 bytes (omitted in NativeAOT ABI)
693693
* |-----------------------|
694-
* |Callee saved registers | // multiple of 8 bytes, not includting FP/RA
694+
* |Callee saved registers | // multiple of 8 bytes, not including FP/RA
695695
* |-----------------------|
696696
* | Saved FP, RA | // 16 bytes
697697
* |-----------------------|

src/coreclr/jit/codegenriscv64.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ void CodeGen::genRestoreCalleeSavedRegistersHelp(regMaskTP regsToRestoreMask, in
787787
* |-----------------------|
788788
* ~ alignment padding ~ // To make the whole frame 16 byte aligned
789789
* |-----------------------|
790-
* |Callee saved registers | // multiple of 8 bytes, not includting FP/RA
790+
* |Callee saved registers | // multiple of 8 bytes, not including FP/RA
791791
* |-----------------------|
792792
* | Saved FP, RA | // 16 bytes
793793
* |-----------------------|

src/coreclr/jit/lclvars.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5707,15 +5707,15 @@ void Compiler::lvaFixVirtualFrameOffsets()
57075707
}
57085708
#endif // !TARGET_LOONGARCH64 || !TARGET_RISCV64
57095709

5710+
#if defined(TARGET_AMD64)
57105711
if (opts.IsOSR())
57115712
{
5712-
#if defined(TARGET_AMD64)
57135713
// Stack offset includes Tier0 frame.
57145714
//
57155715
JITDUMP("--- delta bump %d for OSR + Tier0 frame\n", info.compPatchpointInfo->TotalFrameSize());
57165716
delta += info.compPatchpointInfo->TotalFrameSize();
5717-
#endif // TARGET_AMD64
57185717
}
5718+
#endif // TARGET_AMD64
57195719

57205720
JITDUMP("--- virtual stack offset to actual stack offset delta is %d\n", delta);
57215721

0 commit comments

Comments
 (0)