Merge pull request #2836 from uweigand/framesizefix

Fix frame size after unwind rework
This commit is contained in:
Chris Fallin
2021-04-14 12:19:38 -07:00
committed by GitHub

View File

@@ -1298,7 +1298,7 @@ impl<M: ABIMachineSpec> ABICallee for ABICalleeImpl<M> {
} }
// Save clobbered registers. // Save clobbered registers.
let (_, clobber_insts) = M::gen_clobber_save( let (clobber_size, clobber_insts) = M::gen_clobber_save(
self.call_conv, self.call_conv,
&self.flags, &self.flags,
&self.clobbered, &self.clobbered,
@@ -1317,7 +1317,7 @@ impl<M: ABIMachineSpec> ABICallee for ABICalleeImpl<M> {
// [crate::machinst::abi_impl](this module) for more details // [crate::machinst::abi_impl](this module) for more details
// on stackframe layout and nominal SP maintenance. // on stackframe layout and nominal SP maintenance.
self.total_frame_size = Some(total_stacksize); self.total_frame_size = Some(total_stacksize + clobber_size as u32);
insts insts
} }