# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1306493181 -7200
# Node ID f213a4924fbb0b01a10b63a39d67d39be2707f22
# Parent  d6bf240963fb9f6163771e41a36234c2fafea2e1
Sync with CRI changes.

diff -r d6bf240963fb -r f213a4924fbb graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotRuntime.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotRuntime.java	Fri May 27 11:42:16 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotRuntime.java	Fri May 27 12:46:21 2011 +0200
@@ -196,21 +196,6 @@
     }
 
     @Override
-    public RiField getRiField(Field javaField) {
-        throw new UnsupportedOperationException("getRiField");
-    }
-
-    @Override
-    public RiMethod getRiMethod(Method javaMethod) {
-        throw new UnsupportedOperationException("getRiMethod");
-    }
-
-    @Override
-    public RiMethod getRiMethod(Constructor<?> javaConstructor) {
-        throw new UnsupportedOperationException("getRiMethod");
-    }
-
-    @Override
     public CiConstant invoke(RiMethod method, CiMethodInvokeArguments args) {
         return null;
     }
diff -r d6bf240963fb -r f213a4924fbb graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java	Fri May 27 11:42:16 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java	Fri May 27 12:46:21 2011 +0200
@@ -42,7 +42,7 @@
 
     @Override
     public int accessFlags() {
-        return javaClass().getModifiers();
+        return kind.toJavaClass().getModifiers();
     }
 
     @Override
@@ -126,11 +126,6 @@
     }
 
     @Override
-    public Class<?> javaClass() {
-        return kind.toJavaClass();
-    }
-
-    @Override
     public CiKind kind() {
         return kind;
     }
diff -r d6bf240963fb -r f213a4924fbb graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java	Fri May 27 11:42:16 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java	Fri May 27 12:46:21 2011 +0200
@@ -95,11 +95,11 @@
     public CiConstant getEncoding(Representation r) {
         switch (r) {
             case JavaClass:
-                return CiConstant.forObject(javaClass());
+                return CiConstant.forObject(javaMirror);
             case ObjectHub:
                 return CiConstant.forObject(this);
             case StaticFields:
-                return CiConstant.forObject(javaClass());
+                return CiConstant.forObject(javaMirror);
             case TypeInfo:
                 return CiConstant.forObject(this);
             default:
@@ -167,11 +167,6 @@
     }
 
     @Override
-    public Class<?> javaClass() {
-        return javaMirror;
-    }
-
-    @Override
     public CiKind kind() {
         return CiKind.Object;
     }
diff -r d6bf240963fb -r f213a4924fbb graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java
--- a/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java	Fri May 27 11:42:16 2011 +0200
+++ b/graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java	Fri May 27 12:46:21 2011 +0200
@@ -82,11 +82,6 @@
     }
 
     @Override
-    public Class<?> javaClass() {
-        throw unresolved("javaClass");
-    }
-
-    @Override
     public boolean hasSubclass() {
         throw unresolved("hasSubclass()");
     }