--- a/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java	Thu Jun 07 17:06:29 2012 +0200
+++ b/graal/com.oracle.max.cri/src/com/oracle/max/cri/ri/RiRuntime.java	Thu Jun 07 17:07:05 2012 +0200
@@ -63,7 +63,7 @@
      *
      * @return {@code null} if {@code constant.isNull() || !constant.kind.isObject()}
      */
-    RiResolvedType getTypeOf(CiConstant constant);
+    RiResolvedType getTypeOf(RiConstant constant);
 
 
     RiResolvedType getType(Class<?> clazz);
@@ -73,7 +73,7 @@
      *
      * @return true if the two parameters represent the same runtime object, false otherwise
      */
-    boolean areConstantObjectsEqual(CiConstant x, CiConstant y);
+    boolean areConstantObjectsEqual(RiConstant x, RiConstant y);
 
     /**
      * Gets the register configuration to use when compiling a given method.
@@ -100,7 +100,7 @@
     /**
      * Gets the length of the array that is wrapped in a CiConstant object.
      */
-    int getArrayLength(CiConstant array);
+    int getArrayLength(RiConstant array);
 
     /**
      * Performs any runtime-specific conversion on the object used to describe the target of a call.