AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

edge case of returning stack from inlined function

Browse source
This commit is contained in:
Jakub Doka 2024-11-13 15:56:37 +01:00
parent 2e2b7612d9
commit 9cb273a04b
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/src/son.rs
View file

@ -3871,7 +3871,7 @@ impl<'a> Codegen<'a> {
var.remove(&mut self.ci.nodes); var.remove(&mut self.ci.nodes);
} }
let (v, ctrl, scope) = mem::replace(&mut self.ci.inline_ret, prev_inline_ret)?; let (v, ctrl, mut scope) = mem::replace(&mut self.ci.inline_ret, prev_inline_ret)?;
if is_inline if is_inline
&& ctrl.get() != prev_ctrl && ctrl.get() != prev_ctrl
&& (!self.ci.nodes[ctrl.get()].kind.is_eca() && (!self.ci.nodes[ctrl.get()].kind.is_eca()
@ -3880,11 +3880,12 @@ impl<'a> Codegen<'a> {
self.report(body.pos(), "function is makred inline but it contains controlflow"); self.report(body.pos(), "function is makred inline but it contains controlflow");
} }
scope.vars.drain(var_base..).for_each(|v| v.remove(&mut self.ci.nodes));
scope.aclasses.drain(aclass_base..).for_each(|v| v.remove(&mut self.ci.nodes));
scope.aclasses.extend(self.ci.scope.aclasses.drain(aclass_base..));
self.ci.nodes.unlock(v.id); self.ci.nodes.unlock(v.id);
self.ci.scope.clear(&mut self.ci.nodes); self.ci.scope.clear(&mut self.ci.nodes);
self.ci.scope = scope; self.ci.scope = scope;
self.ci.scope.vars.drain(var_base..).for_each(|v| v.remove(&mut self.ci.nodes));
self.ci.scope.aclasses.drain(aclass_base..).for_each(|v| v.remove(&mut self.ci.nodes));
mem::replace(&mut self.ci.ctrl, ctrl).remove(&mut self.ci.nodes); mem::replace(&mut self.ci.ctrl, ctrl).remove(&mut self.ci.nodes);