# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1348556518 -7200
# Node ID c96407df35ea36406b4ea5ce78866fa1f36e58c7
# Parent  5d092bd11278dbe458a7044a675657f5066ec1d2
fixed HotSpotResolvedJavaType.componentType() to correctly implement the specification in JavaType

diff -r 5d092bd11278 -r c96407df35ea graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java	Mon Sep 24 17:15:34 2012 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaType.java	Tue Sep 25 09:01:58 2012 +0200
@@ -71,6 +71,7 @@
     /**
      * For array types, gets the type of the components.
      * This will be null if this is not an array type.
+     * This method is analogous to {@link Class#getComponentType()}.
      *
      * @return the component type of this type if it is an array type otherwise null
      */
diff -r 5d092bd11278 -r c96407df35ea graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Mon Sep 24 17:15:34 2012 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Tue Sep 25 09:01:58 2012 +0200
@@ -74,8 +74,10 @@
 
     @Override
     public ResolvedJavaType componentType() {
-        assert isArrayClass();
-        return (ResolvedJavaType) HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaType_componentType(this);
+        if (isArrayClass) {
+            return (ResolvedJavaType) HotSpotGraalRuntime.getInstance().getCompilerToVM().JavaType_componentType(this);
+        }
+        return null;
     }
 
     @Override