# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1353925346 -3600
# Node ID 472609cc3e1054fa244c57063272b06ac29b497e
# Parent  6838696d54ac59b6dd917ee1447a68e3e827da17
fixed implementation of HotSpotResolvedJavaType.findUniqueConcreteSubtype() for array types

diff -r 6838696d54ac -r 472609cc3e10 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 Nov 26 11:21:18 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaType.java	Mon Nov 26 11:22:26 2012 +0100
@@ -160,7 +160,7 @@
     @Override
     public ResolvedJavaType findUniqueConcreteSubtype() {
         if (isArrayClass()) {
-            return getComponentType().findUniqueConcreteSubtype() != null ? this : null;
+            return getComponentType().findUniqueConcreteSubtype() == getComponentType() ? this : null;
         } else {
             ResolvedJavaType subtype = (ResolvedJavaType) HotSpotGraalRuntime.getInstance().getCompilerToVM().getUniqueConcreteSubtype(this);
             assert subtype == null || !subtype.isInterface();
diff -r 6838696d54ac -r 472609cc3e10 graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfTest.java
--- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfTest.java	Mon Nov 26 11:21:18 2012 +0100
+++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/InstanceOfTest.java	Mon Nov 26 11:22:26 2012 +0100
@@ -324,4 +324,25 @@
         }
         return b;
     }
+
+    abstract static class A {}
+    static class B extends A {}
+
+    public static boolean isArrayOfA(Object o) {
+        return o instanceof A[];
+    }
+
+    public static boolean isArrayOfB(Object o) {
+        return o instanceof A[];
+    }
+
+    @Test
+    public void testArray() {
+        Object bArray = new A[10];
+        Object aArray = new B[10];
+        test("isArrayOfA", aArray);
+        test("isArrayOfA", bArray);
+        test("isArrayOfB", aArray);
+        test("isArrayOfB", bArray);
+    }
 }