Skip to content
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.

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

JIT: Remove BBF_NONE_QUIRK check in loop alignment #95999

Merged
merged 6 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/coreclr/jit/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5483,8 +5483,8 @@ PhaseStatus Compiler::placeLoopAlignInstructions()
}
}

// If there is an unconditional jump (which isn't to the next block)
if (opts.compJitHideAlignBehindJmp && block->KindIs(BBJ_ALWAYS) && !block->HasFlag(BBF_NONE_QUIRK))
// If there is an unconditional jump that won't be removed
if (opts.compJitHideAlignBehindJmp && block->KindIs(BBJ_ALWAYS) && !block->CanRemoveJumpToNext(this))
{
// Track the lower weight blocks
if (block->bbWeight < minBlockSoFar)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7617,7 +7617,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
else
{
assert(block->KindIs(BBJ_ALWAYS));
assert(block->HasFlag(BBF_NONE_QUIRK));
assert(block->JumpsToNext());
}

if (op1->gtFlags & GTF_GLOB_EFFECT)
Expand Down