Mercurial > hg > graal-jvmci-8
annotate jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java @ 23340:22c3bdf28fff
Don't generate LeafType assumptions for isLeaf == true types
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Fri, 01 Apr 2016 10:32:24 -0700 |
parents | a3471785190d |
children | 7ae6a635fad0 |
rev | line source |
---|---|
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
1 /* |
22518
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
2 * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
4 * |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
5 * This code is free software; you can redistribute it and/or modify it |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
6 * under the terms of the GNU General Public License version 2 only, as |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
7 * published by the Free Software Foundation. |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
8 * |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
9 * This code is distributed in the hope that it will be useful, but WITHOUT |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
12 * version 2 for more details (a copy is included in the LICENSE file that |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
13 * accompanied this code). |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
14 * |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
15 * You should have received a copy of the GNU General Public License version |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
16 * 2 along with this work; if not, write to the Free Software Foundation, |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
18 * |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
21 * questions. |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
22 */ |
22518
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
23 |
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
24 /** |
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
25 * @test |
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
26 * @compile TestResolvedJavaType.java TypeUniverse.java TestMetaAccessProvider.java |
22672
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
27 * @run junit jdk.vm.ci.runtime.test.TestResolvedJavaType |
22518
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
28 */ |
37d2643aa69a
Add jtreg annotations to some tests
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22505
diff
changeset
|
29 |
22672
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
30 package jdk.vm.ci.runtime.test; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
31 |
22569
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
32 import static java.lang.reflect.Modifier.isAbstract; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
33 import static java.lang.reflect.Modifier.isFinal; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
34 import static java.lang.reflect.Modifier.isPrivate; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
35 import static java.lang.reflect.Modifier.isProtected; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
36 import static java.lang.reflect.Modifier.isPublic; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
37 import static java.lang.reflect.Modifier.isStatic; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
38 import static org.junit.Assert.assertArrayEquals; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
39 import static org.junit.Assert.assertEquals; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
40 import static org.junit.Assert.assertFalse; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
41 import static org.junit.Assert.assertNotNull; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
42 import static org.junit.Assert.assertNull; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
43 import static org.junit.Assert.assertTrue; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
44 |
22569
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
45 import java.lang.annotation.Annotation; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
46 import java.lang.reflect.Field; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
47 import java.lang.reflect.Method; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
48 import java.lang.reflect.Modifier; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
49 import java.net.URL; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
50 import java.util.Arrays; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
51 import java.util.Collections; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
52 import java.util.HashMap; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
53 import java.util.HashSet; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
54 import java.util.Map; |
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
55 import java.util.Set; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
56 |
22672
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
57 import jdk.vm.ci.common.JVMCIError; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
58 import jdk.vm.ci.meta.Assumptions.AssumptionResult; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
59 import jdk.vm.ci.meta.JavaConstant; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
60 import jdk.vm.ci.meta.JavaKind; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
61 import jdk.vm.ci.meta.ModifiersProvider; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
62 import jdk.vm.ci.meta.ResolvedJavaField; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
63 import jdk.vm.ci.meta.ResolvedJavaMethod; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
64 import jdk.vm.ci.meta.ResolvedJavaType; |
1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22569
diff
changeset
|
65 import jdk.vm.ci.meta.TrustedInterface; |
22054 | 66 |
22569
ec96f33a101d
updated imports to be explicit and added checkstyle rule to forbid * imports
Doug Simon <doug.simon@oracle.com>
parents:
22536
diff
changeset
|
67 import org.junit.Test; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
68 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
69 import sun.reflect.ConstantPool; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
70 |
7043
947de43c68d6
improved documentation for ResolvedJavaType.findUniqueConcreteSubtype()
Doug Simon <doug.simon@oracle.com>
parents:
7037
diff
changeset
|
71 /** |
947de43c68d6
improved documentation for ResolvedJavaType.findUniqueConcreteSubtype()
Doug Simon <doug.simon@oracle.com>
parents:
7037
diff
changeset
|
72 * Tests for {@link ResolvedJavaType}. |
947de43c68d6
improved documentation for ResolvedJavaType.findUniqueConcreteSubtype()
Doug Simon <doug.simon@oracle.com>
parents:
7037
diff
changeset
|
73 */ |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
74 public class TestResolvedJavaType extends TypeUniverse { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
75 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
76 public TestResolvedJavaType() { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
77 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
78 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
79 @Test |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
80 public void findInstanceFieldWithOffsetTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
81 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
82 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
83 Set<Field> reflectionFields = getInstanceFields(c, true); |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
84 for (Field f : reflectionFields) { |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
85 ResolvedJavaField rf = lookupField(type.getInstanceFields(true), f); |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
86 assertNotNull(rf); |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
87 long offset = isStatic(f.getModifiers()) ? unsafe.staticFieldOffset(f) : unsafe.objectFieldOffset(f); |
22536
dc1aeef79e7e
Refactoring: Rename Kind to JavaKind.
Roland Schatz <roland.schatz@oracle.com>
parents:
22518
diff
changeset
|
88 ResolvedJavaField result = type.findInstanceFieldWithOffset(offset, rf.getJavaKind()); |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
89 assertNotNull(result); |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
90 assertTrue(fieldsEqual(f, result)); |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
91 } |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
92 } |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
93 } |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
94 |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
95 @Test |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
96 public void isInterfaceTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
97 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
98 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
99 boolean expected = c.isInterface(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
100 boolean actual = type.isInterface(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
101 assertEquals(expected, actual); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
102 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
103 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
104 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
105 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
106 public void isInstanceClassTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
107 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
108 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
109 boolean expected = !c.isArray() && !c.isPrimitive() && !c.isInterface(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
110 boolean actual = type.isInstanceClass(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
111 assertEquals(expected, actual); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
112 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
113 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
114 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
115 @Test |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
116 public void isArrayTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
117 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
118 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
119 boolean expected = c.isArray(); |
7060
06d5f450f32b
rename: ResolvedJavaType.isArrayClass() -> ResolvedJavaType.isArray()
Doug Simon <doug.simon@oracle.com>
parents:
7057
diff
changeset
|
120 boolean actual = type.isArray(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
121 assertEquals(expected, actual); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
122 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
123 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
124 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
125 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
126 public void getModifiersTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
127 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
128 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
22011
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
129 int expected = c.getModifiers() & ModifiersProvider.jvmClassModifiers(); |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
130 int actual = type.getModifiers() & ModifiersProvider.jvmClassModifiers(); |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
131 Class<?> elementalType = c; |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
132 while (elementalType.isArray()) { |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
133 elementalType = elementalType.getComponentType(); |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
134 } |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
135 if (elementalType.isMemberClass()) { |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
136 // member class get their modifiers from the inner-class attribute in the JVM and |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
137 // from the classfile header in jvmci |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
138 expected &= ~(Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED); |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
139 actual &= ~(Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED); |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
140 } |
4c9d4fe1cbd8
Add ModifiersProvider.isSynthetic, isVarArgs and isBridge.
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
21798
diff
changeset
|
141 assertEquals(String.format("%s: 0x%x != 0x%x", type, expected, actual), expected, actual); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
142 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
143 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
144 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
145 @Test |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
146 public void isAssignableFromTest() { |
22505
575eb1036ea9
fixed all existing -Xlint warnings
Doug Simon <doug.simon@oracle.com>
parents:
22435
diff
changeset
|
147 Class<?>[] all = classes.toArray(new Class<?>[classes.size()]); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
148 for (int i = 0; i < all.length; i++) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
149 Class<?> c1 = all[i]; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
150 for (int j = i; j < all.length; j++) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
151 Class<?> c2 = all[j]; |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
152 ResolvedJavaType t1 = metaAccess.lookupJavaType(c1); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
153 ResolvedJavaType t2 = metaAccess.lookupJavaType(c2); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
154 boolean expected = c1.isAssignableFrom(c2); |
7097
6644cecbd3a7
Replace ResolvedJavaType.isAssignableTo with isAssignableFrom to be consistent with java.lang.Class
Christian Wimmer <christian.wimmer@oracle.com>
parents:
7096
diff
changeset
|
155 boolean actual = t1.isAssignableFrom(t2); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
156 assertEquals(expected, actual); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
157 if (expected && t1 != t2) { |
7097
6644cecbd3a7
Replace ResolvedJavaType.isAssignableTo with isAssignableFrom to be consistent with java.lang.Class
Christian Wimmer <christian.wimmer@oracle.com>
parents:
7096
diff
changeset
|
158 assertFalse(t2.isAssignableFrom(t1)); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
159 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
160 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
161 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
162 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
163 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
164 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
165 public void isInstanceTest() { |
21663
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
166 for (ConstantValue cv : constants()) { |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
167 JavaConstant c = cv.value; |
22536
dc1aeef79e7e
Refactoring: Rename Kind to JavaKind.
Roland Schatz <roland.schatz@oracle.com>
parents:
22518
diff
changeset
|
168 if (c.getJavaKind() == JavaKind.Object && !c.isNull()) { |
21663
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
169 ResolvedJavaType cType = metaAccess.lookupJavaType(c); |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
170 for (ResolvedJavaType t : javaTypes) { |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
171 if (t.isAssignableFrom(cType)) { |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
172 assertTrue(t.isInstance(c)); |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
173 } else { |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
174 assertFalse(t.isInstance(c)); |
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
175 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
176 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
177 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
178 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
179 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
180 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
181 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
182 public void getSuperclassTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
183 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
184 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
185 Class<?> expected = c.getSuperclass(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
186 ResolvedJavaType actual = type.getSuperclass(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
187 if (expected == null) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
188 assertTrue(actual == null); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
189 } else { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
190 assertNotNull(actual); |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
191 assertTrue(actual.equals(metaAccess.lookupJavaType(expected))); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
192 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
193 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
194 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
195 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
196 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
197 public void getInterfacesTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
198 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
199 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
200 Class<?>[] expected = c.getInterfaces(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
201 ResolvedJavaType[] actual = type.getInterfaces(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
202 assertEquals(expected.length, actual.length); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
203 for (int i = 0; i < expected.length; i++) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
204 assertTrue(actual[i].equals(metaAccess.lookupJavaType(expected[i]))); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
205 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
206 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
207 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
208 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
209 public Class<?> getSupertype(Class<?> c) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
210 assert !c.isPrimitive(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
211 if (c.isArray()) { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
212 Class<?> componentType = c.getComponentType(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
213 if (componentType.isPrimitive() || componentType == Object.class) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
214 return Object.class; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
215 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
216 return getArrayClass(getSupertype(componentType)); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
217 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
218 if (c.isInterface()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
219 return Object.class; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
220 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
221 return c.getSuperclass(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
222 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
223 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
224 public Class<?> findLeastCommonAncestor(Class<?> c1Initial, Class<?> c2Initial) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
225 if (c1Initial.isPrimitive() || c2Initial.isPrimitive()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
226 return null; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
227 } else { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
228 Class<?> c1 = c1Initial; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
229 Class<?> c2 = c2Initial; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
230 while (true) { |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
231 if (c1.isAssignableFrom(c2)) { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
232 return c1; |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
233 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
234 if (c2.isAssignableFrom(c1)) { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
235 return c2; |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
236 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
237 c1 = getSupertype(c1); |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
238 c2 = getSupertype(c2); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
239 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
240 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
241 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
242 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
243 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
244 public void findLeastCommonAncestorTest() { |
22505
575eb1036ea9
fixed all existing -Xlint warnings
Doug Simon <doug.simon@oracle.com>
parents:
22435
diff
changeset
|
245 Class<?>[] all = classes.toArray(new Class<?>[classes.size()]); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
246 for (int i = 0; i < all.length; i++) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
247 Class<?> c1 = all[i]; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
248 for (int j = i; j < all.length; j++) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
249 Class<?> c2 = all[j]; |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
250 ResolvedJavaType t1 = metaAccess.lookupJavaType(c1); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
251 ResolvedJavaType t2 = metaAccess.lookupJavaType(c2); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
252 Class<?> expected = findLeastCommonAncestor(c1, c2); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
253 ResolvedJavaType actual = t1.findLeastCommonAncestor(t2); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
254 if (expected == null) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
255 assertTrue(actual == null); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
256 } else { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
257 assertNotNull(actual); |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
258 assertTrue(actual.equals(metaAccess.lookupJavaType(expected))); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
259 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
260 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
261 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
262 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
263 |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
264 private static class Base { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
265 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
266 |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
267 abstract static class Abstract1 extends Base { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
268 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
269 |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
270 interface Interface1 { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
271 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
272 |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
273 static class Concrete1 extends Abstract1 { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
274 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
275 |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
276 static class Concrete2 extends Abstract1 implements Interface1 { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
277 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
278 |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
279 static class Concrete3 extends Concrete2 { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
280 } |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
281 |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
282 static final class Final1 extends Abstract1 { |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
283 } |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
284 |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
285 abstract static class Abstract4 extends Concrete3 { |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
286 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
287 |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
288 void checkConcreteSubtype(ResolvedJavaType type, ResolvedJavaType expected) { |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
289 AssumptionResult<ResolvedJavaType> leafConcreteSubtype = type.findLeafConcreteSubtype(); |
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
290 if (leafConcreteSubtype == null) { |
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
291 // findLeafConcreteSubtype() is conservative |
7045
7ac6e4c10e37
bug fix for HotSpotReslvedJavaType.findUniqueConcreteSubtype() on arrays of interfaces
Doug Simon <doug.simon@oracle.com>
parents:
7044
diff
changeset
|
292 } else { |
7ac6e4c10e37
bug fix for HotSpotReslvedJavaType.findUniqueConcreteSubtype() on arrays of interfaces
Doug Simon <doug.simon@oracle.com>
parents:
7044
diff
changeset
|
293 if (expected == null) { |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
294 assertNull(leafConcreteSubtype); |
7045
7ac6e4c10e37
bug fix for HotSpotReslvedJavaType.findUniqueConcreteSubtype() on arrays of interfaces
Doug Simon <doug.simon@oracle.com>
parents:
7044
diff
changeset
|
295 } else { |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
296 assertTrue(leafConcreteSubtype.getResult().equals(expected)); |
7045
7ac6e4c10e37
bug fix for HotSpotReslvedJavaType.findUniqueConcreteSubtype() on arrays of interfaces
Doug Simon <doug.simon@oracle.com>
parents:
7044
diff
changeset
|
297 } |
23340
22c3bdf28fff
Don't generate LeafType assumptions for isLeaf == true types
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23338
diff
changeset
|
298 assertTrue(!type.isLeaf() || leafConcreteSubtype.isAssumptionFree()); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
299 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
300 |
7060
06d5f450f32b
rename: ResolvedJavaType.isArrayClass() -> ResolvedJavaType.isArray()
Doug Simon <doug.simon@oracle.com>
parents:
7057
diff
changeset
|
301 if (!type.isArray()) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
302 ResolvedJavaType arrayType = type.getArrayClass(); |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
303 AssumptionResult<ResolvedJavaType> arraySubtype = arrayType.findLeafConcreteSubtype(); |
7043
947de43c68d6
improved documentation for ResolvedJavaType.findUniqueConcreteSubtype()
Doug Simon <doug.simon@oracle.com>
parents:
7037
diff
changeset
|
304 if (arraySubtype != null) { |
19800
3362ba500371
Connect required Assumptions with answer to CHA query
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18950
diff
changeset
|
305 assertEquals(arraySubtype.getResult(), arrayType); |
7045
7ac6e4c10e37
bug fix for HotSpotReslvedJavaType.findUniqueConcreteSubtype() on arrays of interfaces
Doug Simon <doug.simon@oracle.com>
parents:
7044
diff
changeset
|
306 } else { |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
307 // findLeafConcreteSubtype() method is conservative |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
308 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
309 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
310 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
311 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
312 @Test |
19801
deab43a789ad
Split LeafType off from ConcreteSubtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
19800
diff
changeset
|
313 public void findLeafConcreteSubtypeTest() { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
314 ResolvedJavaType base = metaAccess.lookupJavaType(Base.class); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
315 checkConcreteSubtype(base, base); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
316 |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
317 ResolvedJavaType a1 = metaAccess.lookupJavaType(Abstract1.class); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
318 ResolvedJavaType c1 = metaAccess.lookupJavaType(Concrete1.class); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
319 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
320 checkConcreteSubtype(base, null); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
321 checkConcreteSubtype(a1, c1); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
322 checkConcreteSubtype(c1, c1); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
323 |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
324 ResolvedJavaType i1 = metaAccess.lookupJavaType(Interface1.class); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
325 ResolvedJavaType c2 = metaAccess.lookupJavaType(Concrete2.class); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
326 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
327 checkConcreteSubtype(base, null); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
328 checkConcreteSubtype(a1, null); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
329 checkConcreteSubtype(c1, c1); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
330 checkConcreteSubtype(i1, c2); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
331 checkConcreteSubtype(c2, c2); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
332 |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
333 ResolvedJavaType c3 = metaAccess.lookupJavaType(Concrete3.class); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
334 checkConcreteSubtype(c2, null); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
335 checkConcreteSubtype(c3, c3); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
336 |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
337 ResolvedJavaType a4 = metaAccess.lookupJavaType(Abstract4.class); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
338 checkConcreteSubtype(c3, null); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
339 checkConcreteSubtype(a4, null); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
340 |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
341 ResolvedJavaType a1a = metaAccess.lookupJavaType(Abstract1[].class); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
342 checkConcreteSubtype(a1a, null); |
23338
a3471785190d
findLeafConcreteSubtype should handle arrays of leaf concrete subtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23318
diff
changeset
|
343 ResolvedJavaType i1a = metaAccess.lookupJavaType(Interface1[].class); |
a3471785190d
findLeafConcreteSubtype should handle arrays of leaf concrete subtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23318
diff
changeset
|
344 checkConcreteSubtype(i1a, null); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
345 ResolvedJavaType c1a = metaAccess.lookupJavaType(Concrete1[].class); |
23338
a3471785190d
findLeafConcreteSubtype should handle arrays of leaf concrete subtype
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
23318
diff
changeset
|
346 checkConcreteSubtype(c1a, c1a); |
15729
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
347 ResolvedJavaType f1a = metaAccess.lookupJavaType(Final1[].class); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
348 checkConcreteSubtype(f1a, f1a); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
349 |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
350 ResolvedJavaType obja = metaAccess.lookupJavaType(Object[].class); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
351 checkConcreteSubtype(obja, null); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
352 |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
353 ResolvedJavaType inta = metaAccess.lookupJavaType(int[].class); |
59a85df7a418
Add some assertions and tests to TestResolvedJavaType.findUniqueConcreteSubtypeTest
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15722
diff
changeset
|
354 checkConcreteSubtype(inta, inta); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
355 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
356 |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
357 interface NoImplementor { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
358 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
359 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
360 interface SingleImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
361 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
362 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
363 static class SingleConcreteImplementor implements SingleImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
364 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
365 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
366 interface SingleAbstractImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
367 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
368 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
369 abstract static class SingleAbstractImplementor implements SingleAbstractImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
370 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
371 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
372 interface MultiImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
373 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
374 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
375 static class ConcreteImplementor1 implements MultiImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
376 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
377 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
378 static class ConcreteImplementor2 implements MultiImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
379 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
380 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
381 interface MultipleAbstractImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
382 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
383 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
384 abstract static class MultiAbstractImplementor1 implements MultipleAbstractImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
385 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
386 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
387 abstract static class MultiAbstractImplementor2 implements MultipleAbstractImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
388 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
389 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
390 interface SingleAbstractImplementorInterface2 { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
391 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
392 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
393 interface ExtendedSingleImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
394 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
395 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
396 abstract static class SingleAbstractImplementor2 implements SingleAbstractImplementorInterface2 { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
397 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
398 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
399 static class ConcreteTransitiveImplementor1 extends SingleAbstractImplementor2 implements ExtendedSingleImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
400 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
401 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
402 static class ConcreteTransitiveImplementor2 extends SingleAbstractImplementor2 implements ExtendedSingleImplementorInterface { |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
403 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
404 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
405 @Test |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
406 public void getSingleImplementorTest() { |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
407 ResolvedJavaType iNi = metaAccess.lookupJavaType(NoImplementor.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
408 assertNull(iNi.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
409 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
410 ResolvedJavaType iSi = metaAccess.lookupJavaType(SingleImplementorInterface.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
411 ResolvedJavaType cSi = metaAccess.lookupJavaType(SingleConcreteImplementor.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
412 assertEquals(cSi, iSi.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
413 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
414 ResolvedJavaType iSai = metaAccess.lookupJavaType(SingleAbstractImplementorInterface.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
415 ResolvedJavaType aSai = metaAccess.lookupJavaType(SingleAbstractImplementor.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
416 assertEquals(aSai, iSai.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
417 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
418 ResolvedJavaType iMi = metaAccess.lookupJavaType(MultiImplementorInterface.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
419 metaAccess.lookupJavaType(ConcreteImplementor1.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
420 metaAccess.lookupJavaType(ConcreteImplementor2.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
421 assertEquals(iMi, iMi.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
422 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
423 ResolvedJavaType iMai = metaAccess.lookupJavaType(MultipleAbstractImplementorInterface.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
424 metaAccess.lookupJavaType(MultiAbstractImplementor1.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
425 metaAccess.lookupJavaType(MultiAbstractImplementor2.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
426 assertEquals(iMai, iMai.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
427 |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
428 ResolvedJavaType iSai2 = metaAccess.lookupJavaType(SingleAbstractImplementorInterface2.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
429 ResolvedJavaType aSai2 = metaAccess.lookupJavaType(SingleAbstractImplementor2.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
430 metaAccess.lookupJavaType(ConcreteTransitiveImplementor1.class); |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
431 metaAccess.lookupJavaType(ConcreteTransitiveImplementor2.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
432 assertEquals(aSai2, iSai2.getSingleImplementor()); |
18183
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
433 } |
d3dfd1f9545f
Add TestResolvedJavaType.getImplementorTest().
Josef Eisl <josef.eisl@jku.at>
parents:
17156
diff
changeset
|
434 |
21547
78f0792aa890
fixed expected exception type in some TestResolvedJavaType tests
Doug Simon <doug.simon@oracle.com>
parents:
21538
diff
changeset
|
435 @Test(expected = JVMCIError.class) |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
436 public void getSingleImplementorTestClassReceiver() { |
18193
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
437 ResolvedJavaType base = metaAccess.lookupJavaType(Base.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
438 base.getSingleImplementor(); |
18193
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
439 } |
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
440 |
21547
78f0792aa890
fixed expected exception type in some TestResolvedJavaType tests
Doug Simon <doug.simon@oracle.com>
parents:
21538
diff
changeset
|
441 @Test(expected = JVMCIError.class) |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
442 public void getSingleImplementorTestPrimitiveReceiver() { |
18193
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
443 ResolvedJavaType primitive = metaAccess.lookupJavaType(int.class); |
18194
b7226cb963c3
Rename ResolvedJavaType.getImplementor() to getSingleImplementor().
Josef Eisl <josef.eisl@jku.at>
parents:
18193
diff
changeset
|
444 primitive.getSingleImplementor(); |
18193
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
445 } |
0a17944b7baf
Throw an exception if ResolvedJavaType.getImplementor() is called with a non-interface type.
Josef Eisl <josef.eisl@jku.at>
parents:
18192
diff
changeset
|
446 |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
447 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
448 public void getComponentTypeTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
449 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
450 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
451 Class<?> expected = c.getComponentType(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
452 ResolvedJavaType actual = type.getComponentType(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
453 if (expected == null) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
454 assertNull(actual); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
455 } else { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
456 assertTrue(actual.equals(metaAccess.lookupJavaType(expected))); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
457 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
458 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
459 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
460 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
461 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
462 public void getArrayClassTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
463 for (Class<?> c : classes) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
464 if (c != void.class) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
465 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
466 Class<?> expected = getArrayClass(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
467 ResolvedJavaType actual = type.getArrayClass(); |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
468 assertTrue(actual.equals(metaAccess.lookupJavaType(expected))); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
469 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
470 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
471 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
472 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
473 static class Declarations { |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
474 |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
475 final Method implementation; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
476 final Set<Method> declarations; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
477 |
23297
4b58c92e939b
remove redundant modifiers
Manuel Rigger <rigger.manuel@gmail.com>
parents:
22672
diff
changeset
|
478 Declarations(Method impl) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
479 this.implementation = impl; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
480 declarations = new HashSet<>(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
481 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
482 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
483 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
484 /** |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
485 * See <a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-5.html#jvms-5.4.5">Method |
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
486 * overriding</a>. |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
487 */ |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
488 static boolean isOverriderOf(Method impl, Method m) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
489 if (!isPrivate(m.getModifiers()) && !isFinal(m.getModifiers())) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
490 if (m.getName().equals(impl.getName())) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
491 if (m.getReturnType() == impl.getReturnType()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
492 if (Arrays.equals(m.getParameterTypes(), impl.getParameterTypes())) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
493 if (isPublic(m.getModifiers()) || isProtected(m.getModifiers())) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
494 // m is public or protected |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
495 return isPublic(impl.getModifiers()) || isProtected(impl.getModifiers()); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
496 } else { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
497 // m is package-private |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
498 return impl.getDeclaringClass().getPackage() == m.getDeclaringClass().getPackage(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
499 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
500 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
501 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
502 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
503 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
504 return false; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
505 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
506 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
507 static final Map<Class<?>, VTable> vtables = new HashMap<>(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
508 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
509 static class VTable { |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
510 |
7044
34753b057324
added unit tests for JavaType, JavaMethod and ResolvedJavaMethod
Doug Simon <doug.simon@oracle.com>
parents:
7043
diff
changeset
|
511 final Map<NameAndSignature, Method> methods = new HashMap<>(); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
512 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
513 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
514 static synchronized VTable getVTable(Class<?> c) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
515 VTable vtable = vtables.get(c); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
516 if (vtable == null) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
517 vtable = new VTable(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
518 if (c != Object.class) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
519 VTable superVtable = getVTable(c.getSuperclass()); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
520 vtable.methods.putAll(superVtable.methods); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
521 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
522 for (Method m : c.getDeclaredMethods()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
523 if (!isStatic(m.getModifiers()) && !isPrivate(m.getModifiers())) { |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
524 if (isAbstract(m.getModifiers())) { |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
525 // A subclass makes a concrete method in a superclass abstract |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
526 vtable.methods.remove(new NameAndSignature(m)); |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
527 } else { |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
528 vtable.methods.put(new NameAndSignature(m), m); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
529 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
530 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
531 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
532 vtables.put(c, vtable); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
533 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
534 return vtable; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
535 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
536 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
537 static Set<Method> findDeclarations(Method impl, Class<?> c) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
538 Set<Method> declarations = new HashSet<>(); |
7044
34753b057324
added unit tests for JavaType, JavaMethod and ResolvedJavaMethod
Doug Simon <doug.simon@oracle.com>
parents:
7043
diff
changeset
|
539 NameAndSignature implSig = new NameAndSignature(impl); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
540 if (c != null) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
541 for (Method m : c.getDeclaredMethods()) { |
7044
34753b057324
added unit tests for JavaType, JavaMethod and ResolvedJavaMethod
Doug Simon <doug.simon@oracle.com>
parents:
7043
diff
changeset
|
542 if (new NameAndSignature(m).equals(implSig)) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
543 declarations.add(m); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
544 break; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
545 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
546 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
547 if (!c.isInterface()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
548 declarations.addAll(findDeclarations(impl, c.getSuperclass())); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
549 } |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
550 for (Class<?> i : c.getInterfaces()) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
551 declarations.addAll(findDeclarations(impl, i)); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
552 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
553 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
554 return declarations; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
555 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
556 |
15722
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
557 private static void checkResolveMethod(ResolvedJavaType type, ResolvedJavaType context, ResolvedJavaMethod decl, ResolvedJavaMethod expected) { |
18191
839f97696479
Rename ResolvedJavaMethod.resolvedMethod() to resolveConcreteMethod() the reflect its actual behavior.
Josef Eisl <josef.eisl@jku.at>
parents:
18187
diff
changeset
|
558 ResolvedJavaMethod impl = type.resolveConcreteMethod(decl, context); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
559 assertEquals(expected, impl); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
560 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
561 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
562 @Test |
18192
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
563 public void resolveMethodTest() { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
564 ResolvedJavaType context = metaAccess.lookupJavaType(TestResolvedJavaType.class); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
565 for (Class<?> c : classes) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
566 if (c.isInterface() || c.isPrimitive()) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
567 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
568 for (Method m : c.getDeclaredMethods()) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
569 if (JAVA_VERSION <= 1.7D || (!isStatic(m.getModifiers()) && !isPrivate(m.getModifiers()))) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
570 ResolvedJavaMethod resolved = metaAccess.lookupJavaMethod(m); |
22165
af6cc957bf04
Remove dummy parameter `includeAbstract` from `ResolvedJavaType#resolveMethod()`;
Josef Eisl <josef.eisl@jku.at>
parents:
22054
diff
changeset
|
571 ResolvedJavaMethod impl = type.resolveMethod(resolved, context); |
18192
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
572 ResolvedJavaMethod expected = resolved.isDefault() || resolved.isAbstract() ? resolved : null; |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
573 assertEquals(m.toString(), expected, impl); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
574 } else { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
575 // As of JDK 8, interfaces can have static and private methods |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
576 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
577 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
578 } else { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
579 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
580 VTable vtable = getVTable(c); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
581 for (Method impl : vtable.methods.values()) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
582 Set<Method> decls = findDeclarations(impl, c); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
583 for (Method decl : decls) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
584 ResolvedJavaMethod m = metaAccess.lookupJavaMethod(decl); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
585 if (m.isPublic()) { |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
586 ResolvedJavaMethod i = metaAccess.lookupJavaMethod(impl); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
587 checkResolveMethod(type, context, m, i); |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
588 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
589 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
590 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
591 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
592 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
593 } |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
594 |
660875e586f0
Add ResolvedJavaType.resolveMethod() (get the like-time resolved method).
Josef Eisl <josef.eisl@jku.at>
parents:
18191
diff
changeset
|
595 @Test |
18191
839f97696479
Rename ResolvedJavaMethod.resolvedMethod() to resolveConcreteMethod() the reflect its actual behavior.
Josef Eisl <josef.eisl@jku.at>
parents:
18187
diff
changeset
|
596 public void resolveConcreteMethodTest() { |
15722
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
597 ResolvedJavaType context = metaAccess.lookupJavaType(TestResolvedJavaType.class); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
598 for (Class<?> c : classes) { |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
599 if (c.isInterface() || c.isPrimitive()) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
600 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
601 for (Method m : c.getDeclaredMethods()) { |
13183
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
602 if (JAVA_VERSION <= 1.7D || (!isStatic(m.getModifiers()) && !isPrivate(m.getModifiers()))) { |
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
603 ResolvedJavaMethod resolved = metaAccess.lookupJavaMethod(m); |
18191
839f97696479
Rename ResolvedJavaMethod.resolvedMethod() to resolveConcreteMethod() the reflect its actual behavior.
Josef Eisl <josef.eisl@jku.at>
parents:
18187
diff
changeset
|
604 ResolvedJavaMethod impl = type.resolveConcreteMethod(resolved, context); |
13183
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
605 ResolvedJavaMethod expected = resolved.isDefault() ? resolved : null; |
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
606 assertEquals(m.toString(), expected, impl); |
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
607 } else { |
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
608 // As of JDK 8, interfaces can have static and private methods |
0266ac3b26c0
JDK8: added support for default methods as well as interfaces containing static and private methods
Doug Simon <doug.simon@oracle.com>
parents:
11959
diff
changeset
|
609 } |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
610 } |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
611 } else { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
612 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
613 VTable vtable = getVTable(c); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
614 for (Method impl : vtable.methods.values()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
615 Set<Method> decls = findDeclarations(impl, c); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
616 for (Method decl : decls) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
617 ResolvedJavaMethod m = metaAccess.lookupJavaMethod(decl); |
15722
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
618 if (m.isPublic()) { |
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
619 ResolvedJavaMethod i = metaAccess.lookupJavaMethod(impl); |
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
620 checkResolveMethod(type, context, m, i); |
c583759bbcfd
ResolvedJavaType.resolveMethod now takes a callerType that is used to check access rules. Make it work for default methods.
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
15040
diff
changeset
|
621 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
622 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
623 } |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
624 for (Method m : c.getDeclaredMethods()) { |
18191
839f97696479
Rename ResolvedJavaMethod.resolvedMethod() to resolveConcreteMethod() the reflect its actual behavior.
Josef Eisl <josef.eisl@jku.at>
parents:
18187
diff
changeset
|
625 ResolvedJavaMethod impl = type.resolveConcreteMethod(metaAccess.lookupJavaMethod(m), context); |
11823
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
626 ResolvedJavaMethod expected = isAbstract(m.getModifiers()) ? null : impl; |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
627 assertEquals(type + " " + m.toString(), expected, impl); |
6440f50c1ea8
improved documentation and testing for ResolvedJavaType.resolveMethod() (GRAAL-489)
Doug Simon <doug.simon@oracle.com>
parents:
11520
diff
changeset
|
628 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
629 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
630 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
631 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
632 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
633 @Test |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
634 public void findUniqueConcreteMethodTest() throws NoSuchMethodException { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
635 ResolvedJavaMethod thisMethod = metaAccess.lookupJavaMethod(getClass().getDeclaredMethod("findUniqueConcreteMethodTest")); |
19800
3362ba500371
Connect required Assumptions with answer to CHA query
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
18950
diff
changeset
|
636 ResolvedJavaMethod ucm = metaAccess.lookupJavaType(getClass()).findUniqueConcreteMethod(thisMethod).getResult(); |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
637 assertEquals(thisMethod, ucm); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
638 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
639 |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
640 public static Set<Field> getInstanceFields(Class<?> c, boolean includeSuperclasses) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
641 if (c.isArray() || c.isPrimitive() || c.isInterface()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
642 return Collections.emptySet(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
643 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
644 Set<Field> result = new HashSet<>(); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
645 for (Field f : c.getDeclaredFields()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
646 if (!Modifier.isStatic(f.getModifiers())) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
647 result.add(f); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
648 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
649 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
650 if (includeSuperclasses && c != Object.class) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
651 result.addAll(getInstanceFields(c.getSuperclass(), true)); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
652 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
653 return result; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
654 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
655 |
15841
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
656 public static Set<Field> getStaticFields(Class<?> c) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
657 Set<Field> result = new HashSet<>(); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
658 for (Field f : c.getDeclaredFields()) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
659 if (Modifier.isStatic(f.getModifiers())) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
660 result.add(f); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
661 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
662 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
663 return result; |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
664 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
665 |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
666 public boolean fieldsEqual(Field f, ResolvedJavaField rjf) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
667 return rjf.getDeclaringClass().equals(metaAccess.lookupJavaType(f.getDeclaringClass())) && rjf.getName().equals(f.getName()) && |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
668 rjf.getType().resolve(rjf.getDeclaringClass()).equals(metaAccess.lookupJavaType(f.getType())); |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
669 } |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
670 |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
671 public ResolvedJavaField lookupField(ResolvedJavaField[] fields, Field key) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
672 for (ResolvedJavaField rf : fields) { |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
673 if (fieldsEqual(key, rf)) { |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
674 return rf; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
675 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
676 } |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
677 return null; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
678 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
679 |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
680 public Field lookupField(Set<Field> fields, ResolvedJavaField key) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
681 for (Field f : fields) { |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
682 if (fieldsEqual(f, key)) { |
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
683 return f; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
684 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
685 } |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
686 return null; |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
687 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
688 |
21663
381ab4105afe
moved com.oracle.graal.java.test to com.oracle.jvmci.runtime.test
Doug Simon <doug.simon@oracle.com>
parents:
21556
diff
changeset
|
689 private static boolean isHiddenFromReflection(ResolvedJavaField f) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
690 if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(Throwable.class)) && f.getName().equals("backtrace")) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
691 return true; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
692 } |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
693 if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(ConstantPool.class)) && f.getName().equals("constantPoolOop")) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
694 return true; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
695 } |
20811
652194a6414f
Class.classloader is hidden from reflection
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19801
diff
changeset
|
696 if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(Class.class)) && f.getName().equals("classLoader")) { |
652194a6414f
Class.classloader is hidden from reflection
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19801
diff
changeset
|
697 return true; |
652194a6414f
Class.classloader is hidden from reflection
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19801
diff
changeset
|
698 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
699 return false; |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
700 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
701 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
702 @Test |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
703 public void getInstanceFieldsTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
704 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
705 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7530
5e3d1a68664e
applied mx eclipseformat to all Java files
Doug Simon <doug.simon@oracle.com>
parents:
7282
diff
changeset
|
706 for (boolean includeSuperclasses : new boolean[]{true, false}) { |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
707 Set<Field> expected = getInstanceFields(c, includeSuperclasses); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
708 ResolvedJavaField[] actual = type.getInstanceFields(includeSuperclasses); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
709 for (Field f : expected) { |
7056
2841e28b5f41
added test for ResolvedJavaType.findFieldWithOffset
Doug Simon <doug.simon@oracle.com>
parents:
7045
diff
changeset
|
710 assertNotNull(lookupField(actual, f)); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
711 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
712 for (ResolvedJavaField rf : actual) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
713 if (!isHiddenFromReflection(rf)) { |
20811
652194a6414f
Class.classloader is hidden from reflection
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
19801
diff
changeset
|
714 assertEquals(rf.toString(), lookupField(expected, rf) != null, !rf.isInternal()); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
715 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
716 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
717 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
718 // Test stability of getInstanceFields |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
719 ResolvedJavaField[] actual2 = type.getInstanceFields(includeSuperclasses); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
720 assertArrayEquals(actual, actual2); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
721 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
722 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
723 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
724 |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
725 @Test |
15841
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
726 public void getStaticFieldsTest() { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
727 for (Class<?> c : classes) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
728 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
729 Set<Field> expected = getStaticFields(c); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
730 ResolvedJavaField[] actual = type.getStaticFields(); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
731 for (Field f : expected) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
732 assertNotNull(lookupField(actual, f)); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
733 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
734 for (ResolvedJavaField rf : actual) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
735 if (!isHiddenFromReflection(rf)) { |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
736 assertEquals(lookupField(expected, rf) != null, !rf.isInternal()); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
737 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
738 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
739 |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
740 // Test stability of getStaticFields |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
741 ResolvedJavaField[] actual2 = type.getStaticFields(); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
742 assertArrayEquals(actual, actual2); |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
743 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
744 } |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
745 |
cb87019df5aa
Add test for getStaticFields()
Christian Wimmer <christian.wimmer@oracle.com>
parents:
15729
diff
changeset
|
746 @Test |
11953
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
747 public void getDeclaredMethodsTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
748 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
749 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
11953
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
750 Method[] raw = c.getDeclaredMethods(); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
751 Set<ResolvedJavaMethod> expected = new HashSet<>(); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
752 for (Method m : raw) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
753 ResolvedJavaMethod resolvedMethod = metaAccess.lookupJavaMethod(m); |
11953
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
754 assertNotNull(resolvedMethod); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
755 expected.add(resolvedMethod); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
756 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
757 Set<ResolvedJavaMethod> actual = new HashSet<>(Arrays.asList(type.getDeclaredMethods())); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
758 assertEquals(expected, actual); |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
759 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
760 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
761 |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
762 static class A { |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
763 static String name = "foo"; |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
764 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
765 |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
766 static class B extends A { |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
767 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
768 |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
769 static class C { |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
770 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
771 |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
772 static class D { |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
773 void foo() { |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
774 // use of assertions causes the class to have a <clinit> |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
775 assert getClass() != null; |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
776 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
777 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
778 |
22012
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
779 static class SubD extends D { |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
780 |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
781 } |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
782 |
11953
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
783 @Test |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
784 public void getClassInitializerTest() { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
785 assertNotNull(metaAccess.lookupJavaType(A.class).getClassInitializer()); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
786 assertNotNull(metaAccess.lookupJavaType(D.class).getClassInitializer()); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
787 assertNull(metaAccess.lookupJavaType(B.class).getClassInitializer()); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
788 assertNull(metaAccess.lookupJavaType(C.class).getClassInitializer()); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
789 assertNull(metaAccess.lookupJavaType(int.class).getClassInitializer()); |
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
790 assertNull(metaAccess.lookupJavaType(void.class).getClassInitializer()); |
11953
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
791 } |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
792 |
f9f18098479e
added tests for ResolvedJavaType.getClassInitializer() and ResolvedJavaType.getDeclaredMethods()
Doug Simon <doug.simon@oracle.com>
parents:
11823
diff
changeset
|
793 @Test |
22435
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
794 public void getAnnotationsTest() { |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
795 for (Class<?> c : classes) { |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
796 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
797 assertArrayEquals(c.getAnnotations(), type.getAnnotations()); |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
798 } |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
799 } |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
800 |
ccfb5d9c5fc8
Add unitests
Christian Wimmer <christian.wimmer@oracle.com>
parents:
22165
diff
changeset
|
801 @Test |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
802 public void getAnnotationTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
803 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
804 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
805 for (Annotation a : c.getAnnotations()) { |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
806 assertEquals(a, type.getAnnotation(a.annotationType())); |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
807 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
808 } |
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
809 } |
7829
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
810 |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
811 @Test |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
812 public void memberClassesTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
813 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
814 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7829
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
815 assertEquals(c.isLocalClass(), type.isLocal()); |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
816 assertEquals(c.isMemberClass(), type.isMember()); |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
817 Class<?> enclc = c.getEnclosingClass(); |
7829
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
818 ResolvedJavaType enclt = type.getEnclosingType(); |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
819 assertFalse(enclc == null ^ enclt == null); |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
820 if (enclc != null) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
821 assertEquals(enclt, metaAccess.lookupJavaType(enclc)); |
7829
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
822 } |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
823 } |
a44887443b0c
support for inner classes (local/member) in meta API
Michael Haupt <michael.haupt@oracle.com>
parents:
7530
diff
changeset
|
824 } |
7831
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
825 |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
826 @Test |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
827 public void classFilePathTest() { |
15040
288c23143d47
Fix most raw type references.
Josef Eisl <josef.eisl@jku.at>
parents:
15018
diff
changeset
|
828 for (Class<?> c : classes) { |
11959
23ccaa863eda
made CodeCacheProvider independent of MetaAccessProvider (GRAAL-511)
Doug Simon <doug.simon@oracle.com>
parents:
11953
diff
changeset
|
829 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
7831
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
830 URL path = type.getClassFilePath(); |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
831 if (type.isPrimitive() || type.isArray()) { |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
832 assertEquals(null, path); |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
833 } else { |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
834 assertNotNull(path); |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
835 String pathString = path.getPath(); |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
836 if (type.isLocal() || type.isMember()) { |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
837 assertTrue(pathString.indexOf('$') > 0); |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
838 } |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
839 } |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
840 } |
fb0ef768d877
simplified class file path retrieval, added test
Michael Haupt <michael.haupt@oracle.com>
parents:
7829
diff
changeset
|
841 } |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
842 |
17156
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
843 @Test |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
844 public void isTrustedInterfaceTypeTest() { |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
845 for (Class<?> c : classes) { |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
846 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
847 if (TrustedInterface.class.isAssignableFrom(c)) { |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
848 assertTrue(type.isTrustedInterfaceType()); |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
849 } |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
850 } |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
851 } |
ac6e25901d62
Add trusted interface concept and use it for WordBase, fix a NPE and some tests
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
16491
diff
changeset
|
852 |
22012
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
853 @Test |
22033
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
854 public void isLeafTest() { |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
855 for (Class<?> c : classes) { |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
856 ResolvedJavaType type = metaAccess.lookupJavaType(c); |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
857 ResolvedJavaType arrayType = c != void.class ? metaAccess.lookupJavaType(getArrayClass(c)) : null; |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
858 if (c.isPrimitive()) { |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
859 assertTrue(type.isLeaf()); |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
860 assertTrue(arrayType == null || arrayType.isLeaf()); |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
861 } else { |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
862 assertTrue(c.toString(), type.isLeaf() == arrayType.isLeaf()); |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
863 if (!c.isArray()) { |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
864 assertTrue(c.toString(), type.isLeaf() == Modifier.isFinal(c.getModifiers())); |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
865 } |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
866 } |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
867 } |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
868 } |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
869 |
547ae53182bf
Add test for isLeaf
Tom Rodriguez <tom.rodriguez@oracle.com>
parents:
22012
diff
changeset
|
870 @Test |
22012
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
871 public void findMethodTest() { |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
872 try { |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
873 ResolvedJavaMethod findFoo = metaAccess.lookupJavaType(D.class).findMethod("foo", metaAccess.parseMethodDescriptor("()V")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
874 ResolvedJavaMethod expectedFoo = metaAccess.lookupJavaMethod(D.class.getDeclaredMethod("foo")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
875 assertEquals(expectedFoo, findFoo); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
876 |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
877 ResolvedJavaMethod wrongReturnTypeFoo = metaAccess.lookupJavaType(D.class).findMethod("foo", metaAccess.parseMethodDescriptor("()I")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
878 assertNull(wrongReturnTypeFoo); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
879 |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
880 ResolvedJavaMethod wrongArgumentsFoo = metaAccess.lookupJavaType(D.class).findMethod("foo", metaAccess.parseMethodDescriptor("(I)V")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
881 assertNull(wrongArgumentsFoo); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
882 |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
883 ResolvedJavaMethod wrongNameFoo = metaAccess.lookupJavaType(D.class).findMethod("bar", metaAccess.parseMethodDescriptor("()V")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
884 assertNull(wrongNameFoo); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
885 |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
886 ResolvedJavaMethod wrongClassFoo = metaAccess.lookupJavaType(SubD.class).findMethod("foo", metaAccess.parseMethodDescriptor("()V")); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
887 assertNull(wrongClassFoo); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
888 } catch (NoSuchMethodException | SecurityException e) { |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
889 throw new RuntimeException(e); |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
890 } |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
891 } |
53b4acee50f1
Add ResolvedJavaMethod.isSignaturePolymorphic and ResolvedJavaType.findMethod
Gilles Duboscq <gilles.m.duboscq@oracle.com>
parents:
22011
diff
changeset
|
892 |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
893 private Method findTestMethod(Method apiMethod) { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
894 String testName = apiMethod.getName() + "Test"; |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
895 for (Method m : getClass().getDeclaredMethods()) { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
896 if (m.getName().equals(testName) && m.getAnnotation(Test.class) != null) { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
897 return m; |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
898 } |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
899 } |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
900 return null; |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
901 } |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
902 |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
903 // @formatter:off |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
904 private static final String[] untestedApiMethods = { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
905 "initialize", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
906 "isPrimitive", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
907 "newArray", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
908 "getDeclaredConstructors", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
909 "isInitialized", |
11520
7cca436d600b
Add isLinked method to ResolvedJavaType
Gilles Duboscq <duboscq@ssw.jku.at>
parents:
9806
diff
changeset
|
910 "isLinked", |
18361
6ac7e9c85be6
Split getEncoding into two methods.
Roland Schatz <roland.schatz@oracle.com>
parents:
18194
diff
changeset
|
911 "getJavaClass", |
6ac7e9c85be6
Split getEncoding into two methods.
Roland Schatz <roland.schatz@oracle.com>
parents:
18194
diff
changeset
|
912 "getObjectHub", |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
913 "hasFinalizableSubclass", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
914 "hasFinalizer", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
915 "getSourceFileName", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
916 "getClassFilePath", |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
917 "isLocal", |
16491
4d7a9829315e
moved isJavaLangObject(ResolvedJavaType type) from MetaUtil to be a default method in ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
16485
diff
changeset
|
918 "isJavaLangObject", |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
919 "isMember", |
16485
d6604020da93
removed com.oracle.graal.api.meta.jdk8.test project
Doug Simon <doug.simon@oracle.com>
parents:
15841
diff
changeset
|
920 "getElementalType", |
18694
ec1b0b097d82
Ignore $jacocoInit methods in coverage tests.
Roland Schatz <roland.schatz@oracle.com>
parents:
18533
diff
changeset
|
921 "getEnclosingType", |
ec1b0b097d82
Ignore $jacocoInit methods in coverage tests.
Roland Schatz <roland.schatz@oracle.com>
parents:
18533
diff
changeset
|
922 "$jacocoInit" |
9806
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
923 }; |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
924 // @formatter:on |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
925 |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
926 /** |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
927 * Ensures that any new methods added to {@link ResolvedJavaMethod} either have a test written |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
928 * for them or are added to {@link #untestedApiMethods}. |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
929 */ |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
930 @Test |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
931 public void testCoverage() { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
932 Set<String> known = new HashSet<>(Arrays.asList(untestedApiMethods)); |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
933 for (Method m : ResolvedJavaType.class.getDeclaredMethods()) { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
934 if (findTestMethod(m) == null) { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
935 assertTrue("test missing for " + m, known.contains(m.getName())); |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
936 } else { |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
937 assertFalse("test should be removed from untestedApiMethods" + m, known.contains(m.getName())); |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
938 } |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
939 } |
21b8cd853b2b
cleaned up api.meta tests (GRAAL-59)
Doug Simon <doug.simon@oracle.com>
parents:
8959
diff
changeset
|
940 } |
7037
dd81042f4eb1
added unit tests for ResolvedJavaType
Doug Simon <doug.simon@oracle.com>
parents:
diff
changeset
|
941 } |