Skip to content

JIT: Fix debug flowgraph check for un-compacted blocks #103904

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
amanasifkhalid merged 1 commit into from
Jun 24, 2024
Merged

JIT: Fix debug flowgraph check for un-compacted blocks #103904

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: 1 addition & 1 deletion src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6223,7 +6223,7 @@ class Compiler

static fgWalkPreFn fgStress64RsltMulCB;
void fgStress64RsltMul();
void fgDebugCheckUpdate();
void fgDebugCheckUpdate(const bool doAggressiveCompaction);

void fgDebugCheckBBNumIncreasing();
void fgDebugCheckBBlist(bool checkBBNum = false, bool checkBBRefs = true);
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/fgdiagnostic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void Compiler::fgPrintEdgeWeights()

#ifdef DEBUG

void Compiler::fgDebugCheckUpdate()
void Compiler::fgDebugCheckUpdate(const bool doAggressiveCompaction)
{
if (!compStressCompile(STRESS_CHK_FLOW_UPDATE, 30))
{
Expand Down Expand Up @@ -139,7 +139,7 @@ void Compiler::fgDebugCheckUpdate()

/* no un-compacted blocks */

if (fgCanCompactBlock(block))
if (fgCanCompactBlock(block) && (doAggressiveCompaction || block->JumpsToNext()))
{
noway_assert(!"Found un-compacted blocks!");
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/fgopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5691,7 +5691,7 @@ bool Compiler::fgUpdateFlowGraph(bool doTailDuplication /* = false */,
fgVerifyHandlerTab();
// Make sure that the predecessor lists are accurate
fgDebugCheckBBlist();
fgDebugCheckUpdate();
fgDebugCheckUpdate(doAggressiveCompaction);
}
#endif // DEBUG

Expand Down