Merge #516

516: Add workaround for singlepass miscompilation on GetLocal. r=syrusakbary a=losfair Co-authored-by: losfair <[email protected]>
wasmerio · Jul 1, 2019 · 13c5f5e · 13c5f5e
2 parents 5f42045 + c67405f
commit 13c5f5e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
@@ -1692,8 +1692,16 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
             }
             Operator::GetLocal { local_index } => {
                 let local_index = local_index as usize;
-                self.value_stack
-                    .push((self.locals[local_index], LocalOrTemp::Local));
+                let ret = self.machine.acquire_locations(a, &[WpType::I64], false)[0];
+                Self::emit_relaxed_binop(
+                    a,
+                    &mut self.machine,
+                    Assembler::emit_mov,
+                    Size::S64,
+                    self.locals[local_index],
+                    ret,
+                );
+                self.value_stack.push((ret, LocalOrTemp::Temp));
             }
             Operator::SetLocal { local_index } => {
                 let local_index = local_index as usize;