--- old/src/share/vm/code/nmethod.cpp	2015-11-02 01:34:43.700423084 -0500
+++ new/src/share/vm/code/nmethod.cpp	2015-11-02 01:34:42.448352718 -0500
@@ -2662,7 +2662,7 @@
   int cont_offset = ImplicitExceptionTable(this).at( exception_offset );
 #ifdef ASSERT
   if (cont_offset == 0) {
-    Thread* thread = ThreadLocalStorage::get_thread_slow();
+    Thread* thread = Thread::current();
     ResetNoHandleMark rnm; // Might be called from LEAF/QUICK ENTRY
     HandleMark hm(thread);
     ResourceMark rm(thread);