# HG changeset patch
# User jprovino
# Date 1383163608 14400
# Node ID f2f9139ccde94df371b4f92aeb606d30b42aa51b
# Parent  f94a9f0746d88c26a89543cf6ebcfce48b0fdffc# Parent  066778844ed97e5b944bc239428ba3c1ffc05de9
Merge

diff -r f94a9f0746d8 -r f2f9139ccde9 src/share/vm/classfile/systemDictionary.hpp
--- a/src/share/vm/classfile/systemDictionary.hpp	Fri Oct 25 13:43:39 2013 -0700
+++ b/src/share/vm/classfile/systemDictionary.hpp	Wed Oct 30 16:06:48 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                 ) \
diff -r f94a9f0746d8 -r f2f9139ccde9 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Fri Oct 25 13:43:39 2013 -0700
+++ b/src/share/vm/runtime/thread.cpp	Wed Oct 30 16:06:48 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);