Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 43eca89

Browse files
committed
Fix genPrepForEHCodegen for arm64
Enable amd64 code for arm64 as well, to match the expectation of where labels exist in genReportEH. Fixes #14831, a unique case during MinOpts (and probably only minopts) where dead code follows a call/finally block sequence.
1 parent 97d9d59 commit 43eca89

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/jit/codegencommon.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,15 +433,15 @@ void CodeGen::genPrepForEHCodegen()
433433
// has BBF_HAS_LABEL set.
434434
}
435435

436-
#ifdef _TARGET_AMD64_
436+
#if FEATURE_EH_CALLFINALLY_THUNKS
437437
if (HBtab->HasFinallyHandler())
438438
{
439439
anyFinallys = true;
440440
}
441-
#endif // _TARGET_AMD64_
441+
#endif // FEATURE_EH_CALLFINALLY_THUNKS
442442
}
443443

444-
#ifdef _TARGET_AMD64_
444+
#if FEATURE_EH_CALLFINALLY_THUNKS
445445
if (anyFinallys)
446446
{
447447
for (BasicBlock* block = compiler->fgFirstBB; block != nullptr; block = block->bbNext)
@@ -460,7 +460,7 @@ void CodeGen::genPrepForEHCodegen()
460460
} // block is BBJ_CALLFINALLY
461461
} // for each block
462462
} // if (anyFinallys)
463-
#endif // _TARGET_AMD64_
463+
#endif // FEATURE_EH_CALLFINALLY_THUNKS
464464
}
465465

466466
void CodeGenInterface::genUpdateLife(GenTreePtr tree)

0 commit comments

Comments
 (0)