--- old/src/share/vm/runtime/deoptimization.cpp	2016-10-25 10:40:09.304777611 +0200
+++ new/src/share/vm/runtime/deoptimization.cpp	2016-10-25 10:40:09.255777579 +0200
@@ -476,7 +476,7 @@
   // since the frame will "magically" show the original pc before the deopt
   // and we'd undo the deopt.
 
-  frame_pcs[0] = deopt_sender.raw_pc();
+  frame_pcs[0] = deopt_sender.raw_pc(thread);
 
 #ifndef SHARK
   assert(CodeCache::find_blob_unsafe(frame_pcs[0]) != NULL, "bad pc");