T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double-free'd registers in call_direct

Browse Source
This commit is contained in:
Jef
2019-03-18 11:16:32 +01:00
parent a8a26b5948
commit dc42a58277
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend.rs
View File

@@ -3455,7 +3455,9 @@ impl<'module, M: ModuleContext> Context<'module, M> {
self.block_state.regs.release(cond_reg); self.block_state.regs.release(cond_reg);
let out_gpr = match (then, else_) { let out_gpr = match (then, else_) {
(ValueLocation::Reg(then_reg), else_) if self.block_state.regs.num_usages(then_reg) <= 1 => { (ValueLocation::Reg(then_reg), else_)
if self.block_state.regs.num_usages(then_reg) <= 1 =>
{
match else_ { match else_ {
ValueLocation::Reg(reg) => { ValueLocation::Reg(reg) => {
dynasm!(self.asm dynasm!(self.asm
@@ -3475,7 +3477,9 @@ impl<'module, M: ModuleContext> Context<'module, M> {
then_reg then_reg
} }
(then, ValueLocation::Reg(else_reg)) if self.block_state.regs.num_usages(else_reg) <= 1 => { (then, ValueLocation::Reg(else_reg))
if self.block_state.regs.num_usages(else_reg) <= 1 =>
{
match then { match then {
ValueLocation::Reg(reg) => { ValueLocation::Reg(reg) => {
dynasm!(self.asm dynasm!(self.asm
@@ -3686,6 +3690,7 @@ impl<'module, M: ModuleContext> Context<'module, M> {
if offset == -(WORD_SIZE as i32) { if offset == -(WORD_SIZE as i32) {
self.push_physical(val); self.push_physical(val);
self.free_value(val);
} else { } else {
let gpr = self.into_reg(GPRType::Rq, val); let gpr = self.into_reg(GPRType::Rq, val);
dynasm!(self.asm dynasm!(self.asm
@@ -3695,9 +3700,8 @@ impl<'module, M: ModuleContext> Context<'module, M> {
} }
} }
CCLoc::Reg(r) => { CCLoc::Reg(r) => {
if val == ValueLocation::Reg(r) { if val != ValueLocation::Reg(r) {
self.free_value(val); if self.block_state.regs.is_free(r) {
} else if self.block_state.regs.is_free(r) {
self.copy_value(&val, &mut loc.into()); self.copy_value(&val, &mut loc.into());
self.block_state.regs.mark_used(r); self.block_state.regs.mark_used(r);
self.free_value(val); self.free_value(val);
@@ -3707,6 +3711,7 @@ impl<'module, M: ModuleContext> Context<'module, M> {
} }
} }
} }
}
let mut try_count = 10; let mut try_count = 10;
while !pending.is_empty() { while !pending.is_empty() {