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.

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

JIT: don't allow negative edge weights #56651

Merged
merged 1 commit into from
Aug 2, 2021
Merged

JIT: don't allow negative edge weights #56651

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/coreclr/jit/fgprofile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3000,6 +3000,8 @@ bool flowList::setEdgeWeightMaxChecked(BasicBlock::weight_t newWeight,
void flowList::setEdgeWeights(BasicBlock::weight_t theMinWeight, BasicBlock::weight_t theMaxWeight, BasicBlock* bDst)
{
assert(theMinWeight <= theMaxWeight);
assert(theMinWeight >= 0.0f);
assert(theMaxWeight >= 0.0f);

JITDUMP("Setting edge weights for " FMT_BB " -> " FMT_BB " to [" FMT_WT " .. " FMT_WT "]\n", getBlock()->bbNum,
bDst->bbNum, theMinWeight, theMaxWeight);
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/optimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4467,7 +4467,7 @@ bool Compiler::optInvertWhileLoop(BasicBlock* block)
// Note "next" is the loop top block, not bTest's bbNext,
// we'll call this latter block "after".
//
BasicBlock::weight_t const testToNextLikelihood = weightNext / weightTest;
BasicBlock::weight_t const testToNextLikelihood = min(1.0f, weightNext / weightTest);
BasicBlock::weight_t const testToAfterLikelihood = 1.0f - testToNextLikelihood;

// Adjust edges out of bTest (which now has weight weightNext)
Expand Down