From 509442b2a4f2231f731c0bd68e1304483d2e4a2a Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Wed, 3 Jul 2019 11:07:48 -0700 Subject: [PATCH 1/2] 8226566: [JVMCI] java.* classes are no longer necessarily resolved by the boot class loader Reviewed-by: kvn, dlong --- .../jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java index 2df615038f3..d704b0ebe83 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java @@ -838,10 +838,8 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem // Primitive type resolution is context free. return true; } - if (elementType.getName().startsWith("Ljava/")) { - // Classes in a java.* package can only be defined by the - // boot class loader. This is enforced by ClassLoader.preDefineClass() - assert hasSameClassLoader(runtime().getJavaLangObject()); + if (elementType.getName().startsWith("Ljava/") && hasSameClassLoader(runtime().getJavaLangObject())) { + // Classes in a java.* package defined by the boot class loader are always resolved. return true; } HotSpotResolvedObjectTypeImpl otherMirror = ((HotSpotResolvedObjectTypeImpl) accessingClass); From 67e5c778aa88d88f7363ff54d9a99481bcd04132 Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Wed, 3 Jul 2019 14:11:21 -0700 Subject: [PATCH 2/2] Added tag jdk-13+28 for changeset 1e95931e7d8f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4af76a4b87c..e21bb5890ae 100644 --- a/.hgtags +++ b/.hgtags @@ -565,3 +565,4 @@ b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23 22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-13+25 0692b67f54621991ba7afbf23e55b788f3555e69 jdk-13+26 b7f68ddec66f996ae3aad03291d129ca9f02482d jdk-13+27 +1e95931e7d8fa7e3899340a9c7cb28dbea50c10c jdk-13+28