---

yaml
---
r: 486
b: refs/heads/master
c: 60e5ad3
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d2e94838ecd0043cc8dfbe2f19d16d9703c2890
+refs/heads/master: 60e5ad384e6b748a780148e9232b9bb44cd08cec

trunk/src/Makefile

@@ -398,6 +398,7 @@ TEST_XFAILS_X86 :=  $(TASK_XFAILS) \
                     test/run-pass/generic-recursive-tag.rs \
                     test/run-pass/int-lib.rs \
                     test/run-pass/iter-ret.rs \
+                    test/run-pass/lib-deque.rs \
                     test/run-pass/lib-map.rs \
                     test/run-pass/mlist-cycle.rs \
                     test/run-pass/obj-as.rs \

trunk/src/boot/be/x86.ml

@@ -311,14 +311,25 @@ let emit_target_specific
                     Il.Mem (Il.next_spill_slot e
                               (Il.ScalarTy (Il.operand_scalar_ty op)))
                   in
-                  let lhs_spill = next_spill_like lhs in
-                  let rhs_spill = next_spill_like rhs in
-
-                    mov lhs_spill lhs;
-                    mov rhs_spill rhs;
-
-                    mov lhs_eax (Il.Cell lhs_spill);
-                    mov rhs_ecx (Il.Cell rhs_spill);
+                  let is_eax cell =
+                    match cell with
+                        Il.Cell (Il.Reg (Il.Hreg hr, _)) -> hr = eax
+                      | _ -> false
+                  in                    
+                    if is_eax lhs
+                    then
+                      mov rhs_ecx rhs
+                    else
+                      begin
+                        let lhs_spill = next_spill_like lhs in
+                        let rhs_spill = next_spill_like rhs in
+
+                          mov lhs_spill lhs;
+                          mov rhs_spill rhs;
+
+                          mov lhs_eax (Il.Cell lhs_spill);
+                          mov rhs_ecx (Il.Cell rhs_spill);
+                      end;
 
                     put (Il.Binary
                            { b with