Skip to content

Commit 3205533

Browse files
author
Aman Khalid
authored
Disable hot/cold splitting for Unix NativeAOT (#71168)
Because it has yet to be tested, this commit disables `opts.compProcedureSplitting` if `generateCFIUnwindCodes()` is true.
1 parent 73e6b3a commit 3205533

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/coreclr/jit/compiler.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3199,6 +3199,14 @@ void Compiler::compInitOptions(JitFlags* jitFlags)
31993199

32003200
opts.compProcedureSplitting = jitFlags->IsSet(JitFlags::JIT_FLAG_PROCSPLIT) || enableFakeSplitting;
32013201

3202+
#ifdef FEATURE_CFI_SUPPORT
3203+
// Hot/cold splitting is not being tested on NativeAOT.
3204+
if (generateCFIUnwindCodes())
3205+
{
3206+
opts.compProcedureSplitting = false;
3207+
}
3208+
#endif // FEATURE_CFI_SUPPORT
3209+
32023210
#ifdef TARGET_LOONGARCH64
32033211
// Hot/cold splitting is not being tested on LoongArch64.
32043212
opts.compProcedureSplitting = false;

src/coreclr/jit/unwind.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,6 @@ void Compiler::unwindEmitFuncCFI(FuncInfoDsc* func, void* pHotCode, void* pColdC
268268
DWORD unwindCodeBytes = 0;
269269
BYTE* pUnwindBlock = nullptr;
270270

271-
#ifdef DEBUG
272-
if (JitConfig.JitFakeProcedureSplitting())
273-
{
274-
pColdCode = nullptr;
275-
}
276-
#endif // DEBUG
277-
278271
if (func->startLoc == nullptr)
279272
{
280273
startOffset = 0;

0 commit comments

Comments
 (0)