# HG changeset patch
# User Christian Wimmer <Christian.Wimmer@Oracle.com>
# Date 1325645247 28800
# Node ID e4cfa571d8c430aec44fca909d96e2ecab4eb1c2
# Parent  f282e35ea8292c68779b5ec0be27da5dfee3ebc1
Do not emit stack-to-stack moves.

diff -r f282e35ea829 -r e4cfa571d8c4 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Tue Jan 03 18:42:32 2012 -0800
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Tue Jan 03 18:47:27 2012 -0800
@@ -125,9 +125,6 @@
     // state merging settings
     public static boolean AssumeVerifiedBytecode             = true;
 
-    // Linear scan settings
-    public static boolean CopyPointerStackArguments          = true;
-
     // Code generator settings
     public static boolean GenLIR                             = true;
     public static boolean GenCode                            = true;
diff -r f282e35ea829 -r e4cfa571d8c4 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Tue Jan 03 18:42:32 2012 -0800
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Tue Jan 03 18:47:27 2012 -0800
@@ -1070,12 +1070,8 @@
                 }
 
                 Interval interval = intervalFor(op.output(0));
-                CiStackSlot copySlot = slot;
-                if (GraalOptions.CopyPointerStackArguments && slot.kind == CiKind.Object) {
-                    copySlot = frameMap.allocateSpillSlot(slot.kind);
-                }
-                interval.setSpillSlot(copySlot);
-                interval.assignLocation(copySlot);
+                interval.setSpillSlot(slot);
+                interval.assignLocation(slot);
             }
         }
     }