--- a/hotspot/src/share/vm/code/nmethod.cpp	Fri Dec 04 04:29:31 2015 +0000
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Fri Dec 04 04:06:37 2015 -0500
@@ -2609,7 +2609,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);