# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1403782018 -7200
# Node ID b2b362cc1a9fbbbcfdc7e97a3e53d5096dcfd4bc
# Parent  b58855f3990e6bd2f21cc3a2c3251fada2ba217b
Rename ValuePosition.superPosition to outerPosition.

diff -r b58855f3990e -r b2b362cc1a9f graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java	Thu Jun 26 13:22:26 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValue.java	Thu Jun 26 13:26:58 2014 +0200
@@ -59,8 +59,8 @@
         valueClass.forEachComponent(inst, this, mode, proc);
     }
 
-    public final void forEachComponent(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition superPosition) {
-        valueClass.forEachComponent(inst, this, mode, proc, superPosition);
+    public final void forEachComponent(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) {
+        valueClass.forEachComponent(inst, this, mode, proc, outerPosition);
     }
 
     @Override
diff -r b58855f3990e -r b2b362cc1a9f graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java	Thu Jun 26 13:22:26 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/CompositeValueClass.java	Thu Jun 26 13:26:58 2014 +0200
@@ -145,8 +145,8 @@
         forEach(inst, obj, directComponentCount, componentOffsets, mode, componentFlags, proc);
     }
 
-    public final void forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, ValuePositionProcedure proc, ValuePosition superPosition) {
-        forEach(inst, obj, directComponentCount, componentOffsets, mode, componentFlags, proc, superPosition);
+    public final void forEachComponent(LIRInstruction inst, CompositeValue obj, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition) {
+        forEach(inst, obj, directComponentCount, componentOffsets, mode, componentFlags, proc, outerPosition);
     }
 
     public String toString(CompositeValue obj) {
diff -r b58855f3990e -r b2b362cc1a9f graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Thu Jun 26 13:22:26 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Thu Jun 26 13:26:58 2014 +0200
@@ -148,25 +148,25 @@
     }
 
     protected static void forEach(LIRInstruction inst, Object obj, int directCount, long[] offsets, OperandMode mode, EnumSet<OperandFlag>[] flags, ValuePositionProcedure proc,
-                    ValuePosition superPosition) {
+                    ValuePosition outerPosition) {
         for (int i = 0; i < offsets.length; i++) {
             assert LIRInstruction.ALLOWED_FLAGS.get(mode).containsAll(flags[i]);
 
             if (i < directCount) {
                 Value value = getValue(obj, offsets[i]);
-                doForValue(inst, mode, proc, superPosition, i, ValuePosition.NO_SUBINDEX, value);
+                doForValue(inst, mode, proc, outerPosition, i, ValuePosition.NO_SUBINDEX, value);
             } else {
                 Value[] values = getValueArray(obj, offsets[i]);
                 for (int j = 0; j < values.length; j++) {
                     Value value = values[j];
-                    doForValue(inst, mode, proc, superPosition, i, j, value);
+                    doForValue(inst, mode, proc, outerPosition, i, j, value);
                 }
             }
         }
     }
 
-    private static void doForValue(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition superPosition, int index, int subIndex, Value value) {
-        ValuePosition position = new ValuePosition(mode, index, subIndex, superPosition);
+    private static void doForValue(LIRInstruction inst, OperandMode mode, ValuePositionProcedure proc, ValuePosition outerPosition, int index, int subIndex, Value value) {
+        ValuePosition position = new ValuePosition(mode, index, subIndex, outerPosition);
         if (value instanceof CompositeValue) {
             CompositeValue composite = (CompositeValue) value;
             composite.forEachComponent(inst, mode, proc, position);
diff -r b58855f3990e -r b2b362cc1a9f graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValuePosition.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValuePosition.java	Thu Jun 26 13:22:26 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ValuePosition.java	Thu Jun 26 13:26:58 2014 +0200
@@ -35,25 +35,25 @@
     private final OperandMode mode;
     private final int index;
     private final int subIndex;
-    private final ValuePosition superPosition;
+    private final ValuePosition outerPosition;
 
     public static final int NO_SUBINDEX = -1;
     public static final ValuePosition ROOT_VALUE_POSITION = null;
 
-    public ValuePosition(OperandMode mode, int index, int subIndex, ValuePosition superPosition) {
+    public ValuePosition(OperandMode mode, int index, int subIndex, ValuePosition outerPosition) {
         this.mode = mode;
         this.index = index;
         this.subIndex = subIndex;
-        this.superPosition = superPosition;
+        this.outerPosition = outerPosition;
     }
 
     public boolean isCompositePosition() {
-        return superPosition != ROOT_VALUE_POSITION;
+        return outerPosition != ROOT_VALUE_POSITION;
     }
 
     public Value get(LIRInstruction inst) {
         if (isCompositePosition()) {
-            CompositeValue compValue = (CompositeValue) superPosition.get(inst);
+            CompositeValue compValue = (CompositeValue) outerPosition.get(inst);
             return compValue.getValueClass().getValue(compValue, this);
         }
         return inst.getLIRInstructionClass().getValue(inst, this);
@@ -61,7 +61,7 @@
 
     public EnumSet<OperandFlag> getFlags(LIRInstruction inst) {
         if (isCompositePosition()) {
-            CompositeValue compValue = (CompositeValue) superPosition.get(inst);
+            CompositeValue compValue = (CompositeValue) outerPosition.get(inst);
             return compValue.getValueClass().getFlags(this);
         }
         return inst.getLIRInstructionClass().getFlags(this);
@@ -69,7 +69,7 @@
 
     public void set(LIRInstruction inst, Value value) {
         if (isCompositePosition()) {
-            CompositeValue compValue = (CompositeValue) superPosition.get(inst);
+            CompositeValue compValue = (CompositeValue) outerPosition.get(inst);
             compValue.getValueClass().setValue(compValue, this, value);
         } else {
             inst.getLIRInstructionClass().setValue(inst, this, value);
@@ -89,15 +89,15 @@
     }
 
     public ValuePosition getSuperPosition() {
-        return superPosition;
+        return outerPosition;
     }
 
     @Override
     public String toString() {
-        if (superPosition == ROOT_VALUE_POSITION) {
-            return mode.toString() + index + "/" + subIndex;
+        if (outerPosition == ROOT_VALUE_POSITION) {
+            return mode.toString() + "(" + index + (subIndex < 0 ? "" : "/" + subIndex) + ")";
         }
-        return superPosition.toString() + "[" + mode.toString() + index + "/" + subIndex + "]";
+        return outerPosition.toString() + "[" + mode.toString() + "(" + index + (subIndex < 0 ? "" : "/" + subIndex) + ")]";
     }
 
     @Override
@@ -107,7 +107,7 @@
         result = prime * result + index;
         result = prime * result + ((mode == null) ? 0 : mode.hashCode());
         result = prime * result + subIndex;
-        result = prime * result + ((superPosition == null) ? 0 : superPosition.hashCode());
+        result = prime * result + ((outerPosition == null) ? 0 : outerPosition.hashCode());
         return result;
     }
 
@@ -132,11 +132,11 @@
         if (subIndex != other.subIndex) {
             return false;
         }
-        if (superPosition == null) {
-            if (other.superPosition != null) {
+        if (outerPosition == null) {
+            if (other.outerPosition != null) {
                 return false;
             }
-        } else if (!superPosition.equals(other.superPosition)) {
+        } else if (!outerPosition.equals(other.outerPosition)) {
             return false;
         }
         return true;