Skip to content

JIT: Defer fgSetOptions until after 2nd-pass EH removal #128573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyAyersMS merged 1 commit into from
May 26, 2026
Merged

JIT: Defer fgSetOptions until after 2nd-pass EH removal #128573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/coreclr/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4588,9 +4588,6 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
lvaRefCountState = RCS_INVALID;
fgLocalVarLivenessDone = false;

// Decide the kind of code we want to generate
fgSetOptions();

fgExpandQmarkNodes(/*early*/ false);

#ifdef DEBUG
Expand Down Expand Up @@ -4675,6 +4672,12 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
fgDebugCheckLinks();
#endif

// Decide the kind of code we want to generate. Done here, after the second
// round of empty-EH removal above, so that EH eliminated post-morph doesn't
// force fully-interruptible codegen / a frame pointer.
Comment thread
AndyAyersMS marked this conversation as resolved.
//
fgSetOptions();

// Morph multi-dimensional array operations.
// (Consider deferring all array operation morphing, including single-dimensional array ops,
// from global morph to here, so cloning doesn't have to deal with morphed forms.)
Expand Down
Loading