# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1325703531 -3600
# Node ID 03eaec130ed1b8616938f9e05c24c8dc67cf899c
# Parent  f3271682fe5ad6228cb4f9448c60a584d9753adf# Parent  35b05867c94a83394eb01f25469489d0db5ae64c
Merge

diff -r f3271682fe5a -r 03eaec130ed1 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	Wed Jan 04 19:57:51 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Wed Jan 04 19:58:51 2012 +0100
@@ -1020,7 +1020,7 @@
      */
     static RegisterPriority registerPriorityOfOutputOperand(LIRInstruction op) {
         if (op.code == StandardOpcode.MOVE) {
-            if (isStackSlot(op.input(0))) {
+            if (isStackSlot(op.input(0)) && op.input(0).kind != CiKind.Object) {
                 // method argument (condition must be equal to handleMethodArguments)
                 return RegisterPriority.None;
             }
@@ -1057,7 +1057,7 @@
      */
     void handleMethodArguments(LIRInstruction op) {
         if (op.code == StandardOpcode.MOVE) {
-            if (isStackSlot(op.input(0))) {
+            if (isStackSlot(op.input(0)) && op.input(0).kind != CiKind.Object) {
                 CiStackSlot slot = (CiStackSlot) op.input(0);
                 if (GraalOptions.DetailedAsserts) {
                     assert op.id() > 0 : "invalid id";