changeset 14090:98e0e315d727

removed java.lang.Class fields in HotSpotResolvedPrimitiveType
author Doug Simon <doug.simon@oracle.com>
date Thu, 06 Mar 2014 17:44:56 +0100
parents 280332c0180e
children ed92bc6900d5
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java
diffstat 1 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java	Thu Mar 06 17:26:09 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedPrimitiveType.java	Thu Mar 06 17:44:56 2014 +0100
@@ -36,8 +36,6 @@
 
     private static final long serialVersionUID = -6208552348908071473L;
     private final Kind kind;
-    private final Class<?> javaMirror;
-    private final Class javaArrayMirror;
 
     /**
      * Gets the Graal mirror for a {@link Kind}.
@@ -62,9 +60,7 @@
     public HotSpotResolvedPrimitiveType(Kind kind) {
         super(String.valueOf(Character.toUpperCase(kind.getTypeChar())));
         this.kind = kind;
-        this.javaMirror = kind.toJavaClass();
-        this.javaArrayMirror = kind == Kind.Void ? null : Array.newInstance(javaMirror, 0).getClass();
-        assert javaMirror.isPrimitive() : javaMirror + " not a primitive type";
+        assert mirror().isPrimitive() : mirror() + " not a primitive type";
     }
 
     @Override
@@ -74,6 +70,7 @@
 
     @Override
     public ResolvedJavaType getArrayClass() {
+        Class javaArrayMirror = kind == Kind.Void ? null : Array.newInstance(mirror(), 0).getClass();
         return HotSpotResolvedObjectType.fromClass(javaArrayMirror);
     }
 
@@ -89,7 +86,6 @@
 
     @Override
     public ResolvedJavaType getSuperclass() {
-        assert javaMirror.getSuperclass() == null;
         return null;
     }
 
@@ -190,7 +186,7 @@
 
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        return javaMirror.getAnnotation(annotationClass);
+        return null;
     }
 
     @Override
@@ -214,7 +210,7 @@
 
     @Override
     public Class<?> mirror() {
-        return javaMirror;
+        return kind.toJavaClass();
     }
 
     @Override
@@ -254,6 +250,6 @@
 
     @Override
     public Constant newArray(int length) {
-        return Constant.forObject(Array.newInstance(javaMirror, length));
+        return Constant.forObject(Array.newInstance(mirror(), length));
     }
 }