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

Fix a panic when splitting a critical edge on a jump_table with nulls.

Browse Source 
This fixes #505.
This commit is contained in:
Dan Gohman
2018-09-12 16:59:03 -07:00
parent f6519c87a4
commit f23ea04242
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/frontend/src/ssa.rs
View File

@@ -657,7 +657,7 @@ impl SSABuilder {
self.blocks[middle_block].add_predecessor(jump_inst_block, jump_inst); self.blocks[middle_block].add_predecessor(jump_inst_block, jump_inst);
self.mark_ebb_header_block_sealed(middle_block); self.mark_ebb_header_block_sealed(middle_block);
for old_dest in func.jump_tables[jt].as_mut_slice() { for old_dest in func.jump_tables[jt].as_mut_slice() {
if old_dest.unwrap() == dest_ebb { if *old_dest == PackedOption::from(dest_ebb) {
*old_dest = PackedOption::from(middle_ebb); *old_dest = PackedOption::from(middle_ebb);
} }
} }
@@ -1013,6 +1013,7 @@ mod tests {
ssa.def_var(x_var, x1, block0); ssa.def_var(x_var, x1, block0);
let mut data = JumpTableData::new(); let mut data = JumpTableData::new();
data.push_entry(ebb1); data.push_entry(ebb1);
data.set_entry(2, ebb1);
let jt = func.create_jump_table(data); let jt = func.create_jump_table(data);
ssa.use_var(&mut func, x_var, I32, block0).0; ssa.use_var(&mut func, x_var, I32, block0).0;
let br_table = { let br_table = {