--- old/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2015-11-11 15:11:42.888422321 -0500
+++ new/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2015-11-11 15:11:41.096320844 -0500
@@ -221,7 +221,7 @@
                         int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();
+  Thread* t = ThreadLocalStorage::thread(); // can't use Thread::current()
 
   // Must do this before SignalHandlerMark, if crash protection installed we will longjmp away
   // (no destructors can be run)