Skip to content

Re-work fix for flow graph update. #40162

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
erozenfeld merged 1 commit into from
Jul 31, 2020
Merged

Re-work fix for flow graph update. #40162

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/src/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4964,7 +4964,7 @@ class Compiler

// When the flow graph changes, we need to update the block numbers, predecessor lists, reachability sets, and
// dominators.
void fgUpdateChangedFlowGraph();
void fgUpdateChangedFlowGraph(bool computeDoms = true);

public:
// Compute the predecessors of the blocks in the control flow graph.
Expand Down
11 changes: 8 additions & 3 deletions src/coreclr/src/jit/flowgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ bool Compiler::fgReachable(BasicBlock* b1, BasicBlock* b2)
* it again.
*/

void Compiler::fgUpdateChangedFlowGraph()
void Compiler::fgUpdateChangedFlowGraph(bool computeDoms)
{
// We need to clear this so we don't hit an assert calling fgRenumberBlocks().
fgDomsComputed = false;
Expand All @@ -1875,7 +1875,11 @@ void Compiler::fgUpdateChangedFlowGraph()

fgComputePreds();
fgComputeEnterBlocksSet();
fgComputeReachability();
fgComputeReachabilitySets();
if (computeDoms)
{
fgComputeDoms();
}
}

/*****************************************************************************
Expand Down Expand Up @@ -3722,7 +3726,8 @@ PhaseStatus Compiler::fgInsertGCPolls()
{
noway_assert(opts.OptimizationEnabled());
fgReorderBlocks();
fgUpdateChangedFlowGraph();
constexpr bool computeDoms = false;
Copy link
Member

@AndyAyersMS AndyAyersMS Jul 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const isn't sufficient...?

Copy link
Member Author

@erozenfeld erozenfeld Jul 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const would've worked too.

fgUpdateChangedFlowGraph(computeDoms);
}
#ifdef DEBUG
if (verbose)
Expand Down