--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Fri Apr 22 21:52:33 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java	Fri Apr 22 22:13:35 2011 +0200
@@ -177,7 +177,7 @@
     }
 
     @Override
-    public Class<?> accessor() {
+    public RiType accessor() {
         return null;
     }
 

--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Fri Apr 22 21:52:33 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java	Fri Apr 22 22:13:35 2011 +0200
@@ -152,7 +152,7 @@
     }
 
     @Override
-    public Class<?> accessor() {
+    public RiType accessor() {
         return null;
     }
 

--- a/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotRuntime.java	Fri Apr 22 21:52:33 2011 +0200
+++ b/graal/Runtime/src/com/sun/hotspot/c1x/HotSpotRuntime.java	Fri Apr 22 22:13:35 2011 +0200
@@ -140,29 +140,23 @@
         return null;
     }
 
-    @Override
-    public RiType getRiType(Class<?> javaClass) {
-        assert javaClass != null;
-        return compiler.getVMEntries().getType(javaClass);
-    }
-
     public Class<?> getJavaClass(CiConstant c) {
         return null;
     }
 
     @Override
-    public RiType getRiType(CiKind kind) {
-        return getRiType(kind.toJavaClass());
+    public RiType asRiType(CiKind kind) {
+        return compiler.getVMEntries().getType(kind.toJavaClass());
     }
 
     @Override
-    public RiType getRiType(CiConstant constant) {
+    public RiType getTypeOf(CiConstant constant) {
         return compiler.getVMEntries().getRiType(constant);
     }
 
     @Override
     public boolean isExceptionType(RiType type) {
-        return type.isSubtypeOf(getRiType(Throwable.class));
+        return type.isSubtypeOf(compiler.getVMEntries().getType(Throwable.class));
     }
 
     @Override
@@ -227,7 +221,7 @@
     }
 
     @Override
-    public boolean compareConstantObjects(CiConstant x, CiConstant y) {
+    public boolean areConstantObjectsEqual(CiConstant x, CiConstant y) {
         return compiler.getVMEntries().compareConstantObjects(x, y);
     }
 
@@ -253,4 +247,14 @@
     public int getArrayLength(CiConstant array) {
         return compiler.getVMEntries().getArrayLength(array);
     }
+
+    @Override
+    public Class<?> asJavaClass(CiConstant c) {
+        return null;
+    }
+
+    @Override
+    public Object asJavaObject(CiConstant c) {
+        return null;
+    }
 }