T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
T0b1
2023-04-15 05:00:52 +02:00
parent a31407c991
commit afb8d61c87
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cranelift/codegen/src/machinst/blockorder.rs
View File

@@ -184,7 +184,7 @@ impl BlockLoweringOrder {
visit_block_succs(f, block, |_, succ, from_table| { visit_block_succs(f, block, |_, succ, from_table| {
block_out_count[block] += 1; block_out_count[block] += 1;
block_in_count[succ] += 1; block_in_count[succ] += 1;
block_succs.push(LoweredBlock::Orig { block: succ, cold: f.layout.is_cold(succ), indirect_branch_target: from_table }); block_succs.push(LoweredBlock::Orig { block: succ, cold: f.layout.is_cold(succ), indirect_branch_target: false });
if from_table { if from_table {
indirect_branch_target_clif_blocks.insert(succ); indirect_branch_target_clif_blocks.insert(succ);
@@ -254,7 +254,19 @@ impl BlockLoweringOrder {
&LoweredBlock::Orig { block, .. } => { &LoweredBlock::Orig { block, .. } => {
let range = block_succ_range[block].clone(); let range = block_succ_range[block].clone();
lowered_succ_indices lowered_succ_indices
.extend(block_succs[range].iter().map(|lb| lb_to_bindex[lb])); .extend(block_succs[range].iter().map(|lb| {
match lb {
LoweredBlock::Orig { block, cold, .. } => {
match lb_to_bindex.get(&LoweredBlock::Orig { block: *block, cold: *cold, indirect_branch_target: indirect_branch_target_clif_blocks.contains(block) } ) {
Some(idx) => idx,
None => {
panic!("Trying to hashlookup {:?} in HashMap: {:?}", lb, lb_to_bindex);
}
}
},
_ => panic!("Invalid block type in block_succs")
}
}));
let last = f.layout.last_inst(block).unwrap(); let last = f.layout.last_inst(block).unwrap();
let opcode = f.dfg.insts[last].opcode(); let opcode = f.dfg.insts[last].opcode();