portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bugfix in SSA construction.

Browse source
This commit is contained in:
Chris Fallin 2022-11-29 22:28:44 -08:00
parent 0966fdf1e8
commit 7da027a51d
No known key found for this signature in database
GPG key ID: 31649E4FE65EB465
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/frontend.rs
View file

@ -301,7 +301,9 @@ fn parse_body<'a>(
let entry = Block::new(0); let entry = Block::new(0);
builder.body.entry = entry; builder.body.entry = entry;
builder.locals.seal_block_preds(entry, &mut builder.body); builder.locals.seal_block_preds(entry, &mut builder.body);
builder.locals.start_block(entry, false); builder
.locals
.start_block(entry, /* old_reachable = */ false);
for (arg_idx, &arg_ty) in module.signature(my_sig).params.iter().enumerate() { for (arg_idx, &arg_ty) in module.signature(my_sig).params.iter().enumerate() {
let local_idx = Local::new(arg_idx); let local_idx = Local::new(arg_idx);
@ -377,7 +379,14 @@ impl LocalTracker {
log::trace!("finish_block: block {}", self.cur_block); log::trace!("finish_block: block {}", self.cur_block);
if reachable { if reachable {
let mapping = std::mem::take(&mut self.in_cur_block); let mapping = std::mem::take(&mut self.in_cur_block);
self.block_end.insert(self.cur_block, mapping); log::trace!(" -> mapping: {:?}", mapping);
let old_mapping = self.block_end.insert(self.cur_block, mapping);
assert!(
old_mapping.is_none(),
"Mapping already present for {}: {:?}",
self.cur_block,
old_mapping
);
} }
} }
@ -430,10 +439,14 @@ impl LocalTracker {
let placeholder = body.add_placeholder(ty); let placeholder = body.add_placeholder(ty);
body.mark_value_as_local(placeholder, local); body.mark_value_as_local(placeholder, local);
self.block_end if at_block == self.cur_block {
.entry(at_block) self.in_cur_block.insert(local, placeholder);
.or_insert_with(|| FxHashMap::default()) } else {
.insert(local, placeholder); self.block_end
.get_mut(&at_block)
.unwrap()
.insert(local, placeholder);
}
log::trace!(" -> created placeholder: {:?}", placeholder); log::trace!(" -> created placeholder: {:?}", placeholder);
self.compute_blockparam(body, at_block, local, placeholder); self.compute_blockparam(body, at_block, local, placeholder);
placeholder placeholder
@ -1007,7 +1020,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
self.emit_cond_branch(cond, frame.br_target(), &args[..], cont, &[]); self.emit_cond_branch(cond, frame.br_target(), &args[..], cont, &[]);
self.locals.seal_block_preds(cont, &mut self.body); self.locals.seal_block_preds(cont, &mut self.body);
self.cur_block = cont; self.cur_block = cont;
self.locals.start_block(cont, self.reachable); self.locals
.start_block(cont, /* old_reachable = */ self.reachable);
} }
} }
} }
@ -1116,7 +1130,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
} }
// Set `cur_block` only if currently set (otherwise, unreachable!) // Set `cur_block` only if currently set (otherwise, unreachable!)
self.cur_block = *out; self.cur_block = *out;
self.locals.start_block(*out, self.reachable); self.locals
.start_block(*out, /* old_reachable = */ self.reachable);
self.reachable = was_reachable self.reachable = was_reachable
|| match &frame { || match &frame {
Some(Frame::Block { out_reachable, .. }) => *out_reachable, Some(Frame::Block { out_reachable, .. }) => *out_reachable,
@ -1154,16 +1169,19 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
.iter() .iter()
.map(|(_ty, value)| *value) .map(|(_ty, value)| *value)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
self.locals.start_block(*el, self.reachable); self.locals
.start_block(*el, /* old_reachable = */ self.reachable);
self.cur_block = *el; self.cur_block = *el;
self.reachable = *head_reachable; self.reachable = *head_reachable;
self.emit_branch(*out, &else_result_values[..]); self.emit_branch(*out, &else_result_values[..]);
assert_eq!(self.op_stack.len(), *start_depth); assert_eq!(self.op_stack.len(), *start_depth);
} }
self.cur_block = *out; self.cur_block = *out;
let else_reachable = self.reachable;
self.reachable = *head_reachable || was_reachable || *merge_reachable; self.reachable = *head_reachable || was_reachable || *merge_reachable;
self.locals.seal_block_preds(*out, &mut self.body); self.locals.seal_block_preds(*out, &mut self.body);
self.locals.start_block(*out, was_reachable); self.locals
.start_block(*out, /* old_reachable */ else_reachable);
self.push_block_params(results.len()); self.push_block_params(results.len());
} }
Some(Frame::Else { Some(Frame::Else {
@ -1185,7 +1203,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
self.cur_block = *out; self.cur_block = *out;
self.reachable = *merge_reachable || self.reachable; self.reachable = *merge_reachable || self.reachable;
self.locals.seal_block_preds(*out, &mut self.body); self.locals.seal_block_preds(*out, &mut self.body);
self.locals.start_block(*out, was_reachable); self.locals
.start_block(*out, /* old_reachable = */ was_reachable);
self.push_block_params(results.len()); self.push_block_params(results.len());
} }
} }
@ -1221,7 +1240,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
let start_depth = self.op_stack.len(); let start_depth = self.op_stack.len();
self.emit_branch(header, &initial_args[..]); self.emit_branch(header, &initial_args[..]);
self.cur_block = header; self.cur_block = header;
self.locals.start_block(header, self.reachable); self.locals
.start_block(header, /* old_reachable = */ self.reachable);
self.push_block_params(params.len()); self.push_block_params(params.len());
let out = self.body.add_block(); let out = self.body.add_block();
self.add_block_params(out, &results[..]); self.add_block_params(out, &results[..]);
@ -1269,7 +1289,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
self.locals.seal_block_preds(if_true, &mut self.body); self.locals.seal_block_preds(if_true, &mut self.body);
self.locals.seal_block_preds(if_false, &mut self.body); self.locals.seal_block_preds(if_false, &mut self.body);
self.cur_block = if_true; self.cur_block = if_true;
self.locals.start_block(if_true, self.reachable); self.locals
.start_block(if_true, /* old_reachable = */ self.reachable);
} }
wasmparser::Operator::Else => { wasmparser::Operator::Else => {
@ -1299,7 +1320,8 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
merge_reachable: merge_reachable || self.reachable, merge_reachable: merge_reachable || self.reachable,
}); });
self.cur_block = el; self.cur_block = el;
self.locals.start_block(el, self.reachable); self.locals
.start_block(el, /* old_reachable = */ self.reachable);
self.reachable = head_reachable; self.reachable = head_reachable;
} else { } else {
bail!(FrontendError::Internal(format!( bail!(FrontendError::Internal(format!(
@ -1355,7 +1377,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
}; };
self.body self.body
.end_block(self.cur_block, Terminator::Br { target }); .end_block(self.cur_block, Terminator::Br { target });
self.locals.finish_block(true);
} }
} }
@ -1392,7 +1413,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
}, },
}, },
); );
self.locals.finish_block(true);
} }
} }
@ -1435,7 +1455,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
default, default,
}, },
); );
self.locals.finish_block(true);
} }
} }
@ -1451,7 +1470,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
self.body self.body
.end_block(self.cur_block, Terminator::Return { values }); .end_block(self.cur_block, Terminator::Return { values });
self.reachable = false; self.reachable = false;
self.locals.finish_block(true);
} }
} }
@ -1464,7 +1482,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
if self.reachable { if self.reachable {
self.body.end_block(self.cur_block, Terminator::Unreachable); self.body.end_block(self.cur_block, Terminator::Unreachable);
self.reachable = false; self.reachable = false;
self.locals.finish_block(true);
} }
} }