Skip to content

Commit 6a82b7b

Browse files
int3facebook-github-bot
authored andcommitted
regalloc: Always rebuild CFG after inserting instructions
Summary: The lack of rebuilding caused a bug in the code that inserted loads for param register in their immediate dominators. Roughly, we started with this code: B0: load-param v16 load-param v17 load-param v18 load-param v19 if-eqz v16 :foo B1: if-eqz v17 :bar In the first iteration of the regalloc loop, we inserted a load for v18 in B1. Without rebuilding the CFG, we end up with: B0: load-param v16 load-param v17 load-param v18 load-param v19 if-eqz v16 :foo move v0 v18 B1: if-eqz v17 :bar Now in the second iteration of the regalloc loop, we wanted to insert a load for v19 in B0. We looked to see if the last instruction was a branch opcode -- that would necessitate inserting the move instruction before the branch -- but since the last opcode in B0 is now a move, we inserted our load in the wrong place. I'm not sure why the ART verifier doesn't choke on this, but I'm glad arnaudvenet's IRTypeChecker did... Reviewed By: kgsharma Differential Revision: D6194764 fbshipit-source-id: f7945af4771a82afc6c65f9839b84d34dfc18f15
1 parent 5aaa78a commit 6a82b7b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

opt/regalloc/GraphColoring.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -1099,10 +1099,11 @@ void Allocator::allocate(bool use_splitting, IRCode* code) {
10991099
TRACE(REG, 5, "Split plan:\n%s\n", SHOW(split_plan));
11001100
m_stats.split_moves +=
11011101
split(fixpoint_iter, split_plan, split_costs, ig, code);
1102-
// Since in split we might have inserted new blocks to load between
1103-
// blocks. So we call build_cfg() again to have a correct cfg.
1104-
code->build_cfg();
11051102
}
1103+
1104+
// Since we have inserted instructions, we need to rebuild the CFG to
1105+
// ensure that block boundaries remain correct
1106+
code->build_cfg();
11061107
} else {
11071108
transform::remap_registers(code, reg_transform.map);
11081109
code->set_registers_size(reg_transform.size);

0 commit comments

Comments
 (0)