diff graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java @ 2848:c061a6be3728

merge
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Tue, 31 May 2011 15:19:30 +0200
parents bfce42cd9c07
children 14708c03abba
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java	Tue May 31 15:19:08 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/LoadIndexed.java	Tue May 31 15:19:30 2011 +0200
@@ -40,12 +40,11 @@
      * @param array the instruction producing the array
      * @param index the instruction producing the index
      * @param length the instruction producing the length
-     * @param elementType the element type
-     * @param stateAfter the after before executing this instruction
+     * @param elementKind the element type
      * @param graph
      */
-    public LoadIndexed(Value array, Value index, Value length, CiKind elementType, Graph graph) {
-        super(elementType.stackKind(), array, index, length, elementType, INPUT_COUNT, SUCCESSOR_COUNT, graph);
+    public LoadIndexed(Value array, Value index, Value length, CiKind elementKind, Graph graph) {
+        super(elementKind.stackKind(), array, index, length, elementKind, INPUT_COUNT, SUCCESSOR_COUNT, graph);
     }
 
     /**
@@ -88,7 +87,7 @@
 
     @Override
     public Node copy(Graph into) {
-        LoadIndexed x = new LoadIndexed(null, null, null, kind, into);
+        LoadIndexed x = new LoadIndexed(null, null, null, elementKind(), into);
         x.setNonNull(isNonNull());
         return x;
     }