Merge #2723

2723: fix #2721, also adding the test in the regression test suite r=ptitSeb a=ptitSeb # Description Fix for #2721, regression introduce with Windows backend for Singlepass. Co-authored-by: ptitSeb <[email protected]>
wasmerio · Dec 14, 2021 · 068ba62 · 068ba62
2 parents 73777ad + 61b44a5
commit 068ba62
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/compiler-singlepass/src/machine_x64.rs b/lib/compiler-singlepass/src/machine_x64.rs
@@ -1807,15 +1807,11 @@ impl Machine for MachineX86_64 {
     fn push_location_for_native(&mut self, loc: Location) {
         match loc {
             Location::Imm64(_) => {
-                // Dummy value slot to be filled with `mov`.
-                self.assembler.emit_push(Size::S64, Location::GPR(GPR::RAX));
-
-                // Use R9 as the temporary register here, since:
-                // - It is a temporary register that is not used for any persistent value.
-                // - This register as an argument location is only written to after `sort_call_movs`.'
+                // Push R9 value slot to be exchange with `mov`.
+                self.assembler.emit_push(Size::S64, Location::GPR(GPR::R9));
                 self.reserve_unused_temp_gpr(GPR::R9);
                 self.move_location(Size::S64, loc, Location::GPR(GPR::R9));
-                self.move_location(
+                self.assembler.emit_xchg(
                     Size::S64,
                     Location::GPR(GPR::R9),
                     Location::Memory(GPR::RSP, 0),