--- old/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2015-11-19 01:01:05.008922841 -0500
+++ new/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp	2015-11-19 01:01:02.972808279 -0500
@@ -346,7 +346,7 @@
   }
 #endif // !AMD64
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();  // slow & steady
+  Thread* t = Thread::current_or_null_safe();
 
   // Must do this before SignalHandlerMark, if crash protection installed we will longjmp away
   // (no destructors can be run)