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

WIP.

Browse source
This commit is contained in:
Chris Fallin 2022-11-29 13:43:13 -08:00
parent e5491528af
commit 5ee73ea177
No known key found for this signature in database
GPG key ID: 31649E4FE65EB465
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/frontend.rs
View file

@ -722,6 +722,7 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
} }
fn pop_n(&mut self, n: usize) -> Vec<Value> { fn pop_n(&mut self, n: usize) -> Vec<Value> {
assert!(self.reachable);
let new_top = self.op_stack.len() - n; let new_top = self.op_stack.len() - n;
let ret = self.op_stack[new_top..] let ret = self.op_stack[new_top..]
.iter() .iter()
@ -732,6 +733,7 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
} }
fn pop_1(&mut self) -> Value { fn pop_1(&mut self) -> Value {
assert!(self.reachable);
self.op_stack.pop().unwrap().1 self.op_stack.pop().unwrap().1
} }
@ -1121,6 +1123,7 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
self.block_results(&results[..], *start_depth, self.cur_block); self.block_results(&results[..], *start_depth, self.cur_block);
self.emit_branch(*out, &result_values[..]); self.emit_branch(*out, &result_values[..]);
} }
assert!(self.op_stack.len() >= *start_depth);
self.op_stack.truncate(*start_depth); self.op_stack.truncate(*start_depth);
if *head_reachable { if *head_reachable {
// No `else`, so we need to generate a trivial // No `else`, so we need to generate a trivial
@ -1173,7 +1176,11 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
let (params, results) = self.block_params_and_results(*blockty); let (params, results) = self.block_params_and_results(*blockty);
let out = self.body.add_block(); let out = self.body.add_block();
self.add_block_params(out, &results[..]); self.add_block_params(out, &results[..]);
let start_depth = self.op_stack.len().saturating_sub(params.len()); let start_depth = if self.reachable {
self.op_stack.len() - params.len()
} else {
self.op_stack.len()
};
self.ctrl_stack.push(Frame::Block { self.ctrl_stack.push(Frame::Block {
start_depth, start_depth,
out, out,
@ -1190,8 +1197,6 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
let initial_args = if self.reachable { let initial_args = if self.reachable {
self.pop_n(params.len()) self.pop_n(params.len())
} else { } else {
self.op_stack
.truncate(self.op_stack.len().saturating_sub(params.len()));
vec![Value::invalid(); params.len()] vec![Value::invalid(); params.len()]
}; };
let start_depth = self.op_stack.len(); let start_depth = self.op_stack.len();
@ -1226,7 +1231,11 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
params.iter().map(|&ty| (ty, Value::invalid())).collect(), params.iter().map(|&ty| (ty, Value::invalid())).collect(),
) )
}; };
let start_depth = self.op_stack.len().saturating_sub(params.len()); let start_depth = if self.reachable {
self.op_stack.len() - params.len()
} else {
self.op_stack.len()
};
self.ctrl_stack.push(Frame::If { self.ctrl_stack.push(Frame::If {
start_depth, start_depth,
out: join, out: join,