--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Fri Jun 13 20:06:44 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Mon Jun 16 10:44:18 2014 +0200
@@ -67,8 +67,6 @@
      */
     protected int outgoingSize;
 
-    protected int freeSpill4 = -1;
-
     /**
      * Determines if this frame has values on the stack for outgoing calls.
      */
@@ -297,19 +295,8 @@
             }
         }
         int size = spillSlotSize(kind);
-        if (size == 4 && freeSpill4 != -1) {
-            int offset = spillSize - freeSpill4 - size;
-            freeSpill4 = -1;
-            return allocateNewSpillSlot(kind, offset);
-        } else {
-            int origSpillSize = spillSize;
-            spillSize = NumUtil.roundUp(spillSize + size, size);
-            int waste = (spillSize - origSpillSize) - size;
-            if (waste == 4 && freeSpill4 == -1) {
-                freeSpill4 = origSpillSize;
-            }
-            return allocateNewSpillSlot(kind, 0);
-        }
+        spillSize = NumUtil.roundUp(spillSize + size, size);
+        return allocateNewSpillSlot(kind, 0);
     }
 
     private Set<StackSlot> freedSlots;