# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1445318769 25200
# Node ID 82ec3813e75f4dd3c957af17ac0b738b6f5ad9d0
# Parent  640e0be6617bc88301798e5873e3d2a3bedbe528# Parent  9fdb75d6e23978fb169a74c9954a2560b5eb92b1
Merge

diff -r 640e0be6617b -r 82ec3813e75f graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java	Mon Oct 19 17:20:49 2015 -0700
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java	Mon Oct 19 22:26:09 2015 -0700
@@ -310,9 +310,9 @@
     }
 
     @Override
-    public Variable emitAddress(VirtualStackSlot address) {
+    public Variable emitAddress(AllocatableValue stackslot) {
         Variable result = newVariable(LIRKind.value(target().arch.getWordKind()));
-        append(new StackLeaOp(result, address));
+        append(new StackLeaOp(result, stackslot));
         return result;
     }
 
diff -r 640e0be6617b -r 82ec3813e75f graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Mon Oct 19 17:20:49 2015 -0700
+++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Mon Oct 19 22:26:09 2015 -0700
@@ -257,9 +257,9 @@
     }
 
     @Override
-    public Variable emitAddress(VirtualStackSlot address) {
+    public Variable emitAddress(AllocatableValue stackslot) {
         Variable result = newVariable(LIRKind.value(target().arch.getWordKind()));
-        append(new StackLoadAddressOp(result, address));
+        append(new StackLoadAddressOp(result, stackslot));
         return result;
     }
 
diff -r 640e0be6617b -r 82ec3813e75f graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java	Mon Oct 19 17:20:49 2015 -0700
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64Move.java	Mon Oct 19 22:26:09 2015 -0700
@@ -37,6 +37,7 @@
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
@@ -324,10 +325,11 @@
         @Def({REG}) protected AllocatableValue result;
         @Use({STACK, UNINITIALIZED}) protected AllocatableValue slot;
 
-        public StackLeaOp(AllocatableValue result, VirtualStackSlot slot) {
+        public StackLeaOp(AllocatableValue result, AllocatableValue slot) {
             super(TYPE);
             this.result = result;
             this.slot = slot;
+            assert slot instanceof VirtualStackSlot || slot instanceof StackSlot;
         }
 
         @Override
diff -r 640e0be6617b -r 82ec3813e75f graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Mon Oct 19 17:20:49 2015 -0700
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Mon Oct 19 22:26:09 2015 -0700
@@ -442,10 +442,11 @@
         @Def({REG}) protected AllocatableValue result;
         @Use({STACK, UNINITIALIZED}) protected AllocatableValue slot;
 
-        public StackLoadAddressOp(AllocatableValue result, VirtualStackSlot address) {
+        public StackLoadAddressOp(AllocatableValue result, AllocatableValue slot) {
             super(TYPE, SIZE);
             this.result = result;
-            this.slot = address;
+            this.slot = slot;
+            assert slot instanceof VirtualStackSlot || slot instanceof StackSlot;
         }
 
         @Override
diff -r 640e0be6617b -r 82ec3813e75f graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java	Mon Oct 19 17:20:49 2015 -0700
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGeneratorTool.java	Mon Oct 19 22:26:09 2015 -0700
@@ -48,7 +48,6 @@
 import com.oracle.graal.lir.LabelRef;
 import com.oracle.graal.lir.SwitchStrategy;
 import com.oracle.graal.lir.Variable;
-import com.oracle.graal.lir.VirtualStackSlot;
 
 public interface LIRGeneratorTool extends BenchmarkCounterFactory {
 
@@ -169,7 +168,7 @@
      */
     void emitData(AllocatableValue dst, byte[] data);
 
-    Variable emitAddress(VirtualStackSlot slot);
+    Variable emitAddress(AllocatableValue stackslot);
 
     void emitMembar(int barriers);
 
diff -r 640e0be6617b -r 82ec3813e75f mx.graal/suite.py
--- a/mx.graal/suite.py	Mon Oct 19 17:20:49 2015 -0700
+++ b/mx.graal/suite.py	Mon Oct 19 22:26:09 2015 -0700
@@ -14,7 +14,7 @@
             },
             {
                "name" : "truffle",
-               "version" : "1d60440b03a8c942e7707a2d833427b0c5b227c0",
+               "version" : "83d605e7fa57822ac484320fda2542c529948f8d",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},