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:31:23 -08:00
parent 232b34f66b
commit e5491528af
No known key found for this signature in database
GPG key ID: 31649E4FE65EB465
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/frontend.rs
View file

@ -1173,7 +1173,7 @@ 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() - params.len(); let start_depth = self.op_stack.len().saturating_sub(params.len());
self.ctrl_stack.push(Frame::Block { self.ctrl_stack.push(Frame::Block {
start_depth, start_depth,
out, out,
@ -1187,7 +1187,13 @@ 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 header = self.body.add_block(); let header = self.body.add_block();
self.add_block_params(header, &params[..]); self.add_block_params(header, &params[..]);
let initial_args = self.pop_n(params.len()); let initial_args = if self.reachable {
self.pop_n(params.len())
} else {
self.op_stack
.truncate(self.op_stack.len().saturating_sub(params.len()));
vec![Value::invalid(); params.len()]
};
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;
@ -1210,9 +1216,17 @@ impl<'a, 'b> FunctionBodyBuilder<'a, 'b> {
let if_false = self.body.add_block(); let if_false = self.body.add_block();
let join = self.body.add_block(); let join = self.body.add_block();
self.add_block_params(join, &results[..]); self.add_block_params(join, &results[..]);
let cond = self.pop_1(); let (cond, param_values) = if self.reachable {
let param_values = self.op_stack[self.op_stack.len() - params.len()..].to_vec(); let cond = self.pop_1();
let start_depth = self.op_stack.len() - params.len(); let param_values = self.op_stack[self.op_stack.len() - params.len()..].to_vec();
(cond, param_values)
} else {
(
Value::invalid(),
params.iter().map(|&ty| (ty, Value::invalid())).collect(),
)
};
let start_depth = self.op_stack.len().saturating_sub(params.len());
self.ctrl_stack.push(Frame::If { self.ctrl_stack.push(Frame::If {
start_depth, start_depth,
out: join, out: join,