xeos
/
wasmi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean and detail End opcode.

This commit is contained in:
Sergey Pepyakin 2019-04-16 16:29:49 +02:00
parent 921dda469e
commit d5a383a442
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
validation/src/func.rs
View File

@ -258,22 +258,27 @@ impl<'a> FunctionValidationContext<'a> {
};
if self.frame_stack.len() == 1 {
// We are about to close the last frame. Insert
// an explicit return.
// We are about to close the last frame.
// Check the return type.
if let BlockType::Value(value_type) = self.return_type {
tee_value(&mut self.value_stack, &self.frame_stack, value_type.into())?;
}
}
pop_label(&mut self.value_stack, &mut self.frame_stack)?;
// We just poped the last frame. To avoid some difficulties
// we prefer to keep this branch explicit and bail out here.
()
} else {
pop_label(&mut self.value_stack, &mut self.frame_stack)?;
// Push the result value.
if let BlockType::Value(value_type) = block_type {
push_value(&mut self.value_stack, value_type.into())?;
}
}
}
Br(depth) => {
self.validate_br(depth)?;
make_top_frame_polymorphic(&mut self.value_stack, &mut self.frame_stack);