--- old/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2014-11-04 15:41:25.375000000 -0500 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2014-11-04 15:41:25.300000000 -0500 @@ -42,8 +42,12 @@ void VM_CMS_Operation::acquire_pending_list_lock() { // The caller may block while communicating // with the SLT thread in order to acquire/release the PLL. - ConcurrentMarkSweepThread::slt()-> - manipulatePLL(SurrogateLockerThread::acquirePLL); + SurrogateLockerThread* slt = ConcurrentMarkSweepThread::slt(); + if (slt != NULL) { + slt->manipulatePLL(SurrogateLockerThread::acquirePLL); + } else { + SurrogateLockerThread::report_missing_slt(); + } } void VM_CMS_Operation::release_and_notify_pending_list_lock() { --- old/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp 2014-11-04 15:41:25.769000000 -0500 +++ new/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp 2014-11-04 15:41:25.695000000 -0500 @@ -213,8 +213,12 @@ assert(_needs_pll, "don't call this otherwise"); // The caller may block while communicating // with the SLT thread in order to acquire/release the PLL. - ConcurrentMarkThread::slt()-> - manipulatePLL(SurrogateLockerThread::acquirePLL); + SurrogateLockerThread* slt = ConcurrentMarkThread::slt(); + if (slt != NULL) { + slt->manipulatePLL(SurrogateLockerThread::acquirePLL); + } else { + SurrogateLockerThread::report_missing_slt(); + } } void VM_CGC_Operation::release_and_notify_pending_list_lock() { --- old/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp 2014-11-04 15:41:26.164000000 -0500 +++ new/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp 2014-11-04 15:41:26.090000000 -0500 @@ -138,6 +138,13 @@ return res; } +void SurrogateLockerThread::report_missing_slt() { + vm_exit_during_initialization( + "GC before GC support fully initialized: " + "SLT is needed but has not yet been created."); + ShouldNotReachHere(); +} + void SurrogateLockerThread::manipulatePLL(SLT_msg_type msg) { MutexLockerEx x(&_monitor, Mutex::_no_safepoint_check_flag); assert(_buffer == empty, "Should be empty"); --- old/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp 2014-11-04 15:41:26.561000000 -0500 +++ new/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp 2014-11-04 15:41:26.485000000 -0500 @@ -93,6 +93,9 @@ public: static SurrogateLockerThread* make(TRAPS); + // Terminate VM with error message that SLT needed but not yet created. + static void report_missing_slt(); + SurrogateLockerThread(); bool is_hidden_from_external_view() const { return true; } --- old/src/share/vm/runtime/interfaceSupport.cpp 2014-11-04 15:41:26.962000000 -0500 +++ new/src/share/vm/runtime/interfaceSupport.cpp 2014-11-04 15:41:26.888000000 -0500 @@ -87,7 +87,7 @@ // Short-circuit any possible re-entrant gc-a-lot attempt if (thread->skip_gcalot()) return; - if (is_init_completed()) { + if (Threads::is_vm_complete()) { if (++_fullgc_alot_invocation < FullGCALotStart) { return;