Skip to content

JIT: Add debug consistency checks for GT_RETURN nodes #125298

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

Open
BoyBaykiller wants to merge 4 commits into
base: main
Choose a base branch
from
Open

JIT: Add debug consistency checks for GT_RETURN nodes #125298

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27041e7
* add 'Block that isn't BBJ_RETURN should not contain GT_RETURN node.'
BoyBaykiller Mar 7, 2026
cf451bb
* move from fgDebugCheckBBlist to fgDebugCheckStmtsList
BoyBaykiller Mar 8, 2026
9f61468
* add description to assert
BoyBaykiller Mar 8, 2026
61ac458
Merge branch 'main' into add-debug-checks-for-GT_RETURN
BoyBaykiller Mar 11, 2026
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
17 changes: 17 additions & 0 deletions src/coreclr/jit/fgdiagnostic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3929,6 +3929,7 @@ void Compiler::fgDebugCheckLinks(bool morphTrees)
// - all statements in the block are linked correctly
// - check statements flags
// - check nodes gtNext and gtPrev values, if the node list is threaded
// - no invalid statements given the block kind
//
// Arguments:
// block - the block to check statements in
Expand Down Expand Up @@ -3965,6 +3966,22 @@ void Compiler::fgDebugCheckStmtsList(BasicBlock* block, bool morphTrees)
noway_assert(block->lastStmt() == stmt);
}

// Block that isn't BBJ_RETURN should not contain GT_RETURN node.
if (!block->KindIs(BBJ_RETURN))
{
GenTree* tree = stmt->GetRootNode();
assert(!tree->OperIs(GT_RETURN) && "GT_RETURN node found in a block that isn't BBJ_RETURN");
}

// If the block contains a GT_RETURN node it should be last.
if (block->KindIs(BBJ_RETURN))
{
GenTree* tree = stmt->GetRootNode();
bool isReturn = tree->OperIs(GT_RETURN);
bool isNotLastStmt = stmt->GetNextStmt() != nullptr;
assert(!(isReturn && isNotLastStmt) && "GT_RETURN node found that is not the last statement in the block");
}

// For each statement check that the exception flags are properly set

noway_assert(stmt->GetRootNode());
Expand Down
Loading