Mercurial > hg > graal-jvmci-8
changeset 13004:292050e5d5ea
8026877: Error in opening JAR file when invalid jar specified with -Xbootclasspath/a on OpenJDK build
Reviewed-by: coleenp, twisti
author | dholmes |
---|---|
date | Thu, 24 Oct 2013 00:33:14 -0400 |
parents | 2036c97e3af0 |
children | 066778844ed9 |
files | src/share/vm/classfile/systemDictionary.hpp src/share/vm/runtime/thread.cpp |
diffstat | 2 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp Mon Oct 21 22:36:43 2013 -0400 +++ b/src/share/vm/classfile/systemDictionary.hpp Thu Oct 24 00:33:14 2013 -0400 @@ -173,8 +173,6 @@ /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ do_klass(nio_Buffer_klass, java_nio_Buffer, Opt ) \ \ - do_klass(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt ) \ - \ /* Preload boxing klasses */ \ do_klass(Boolean_klass, java_lang_Boolean, Pre ) \ do_klass(Character_klass, java_lang_Character, Pre ) \
--- a/src/share/vm/runtime/thread.cpp Mon Oct 21 22:36:43 2013 -0400 +++ b/src/share/vm/runtime/thread.cpp Thu Oct 24 00:33:14 2013 -0400 @@ -1097,7 +1097,7 @@ // General purpose hook into Java code, run once when the VM is initialized. // The Java library method itself may be changed independently from the VM. static void call_postVMInitHook(TRAPS) { - Klass* k = SystemDictionary::PostVMInitHook_klass(); + Klass* k = SystemDictionary::resolve_or_null(vmSymbols::sun_misc_PostVMInitHook(), THREAD); instanceKlassHandle klass (THREAD, k); if (klass.not_null()) { JavaValue result(T_VOID);