Mercurial > hg > graal-jvmci-8
changeset 2797:f213a4924fbb
Sync with CRI changes.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 27 May 2011 12:46:21 +0200 |
parents | d6bf240963fb |
children | 58e65eb6bb5d |
files | graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotRuntime.java graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypePrimitive.java graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeResolvedImpl.java graal/GraalRuntime/src/com/oracle/graal/runtime/HotSpotTypeUnresolved.java |
diffstat | 4 files changed, 3 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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; }
--- 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; }
--- 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()"); }