# HG changeset patch
# User vlivanov
# Date 1402314542 0
# Node ID 83d8425d85a3c7a7056617d87fd79204021a98aa
# Parent  5da2952ec8748f5a60db8b7a1c6a3ddd757545ac
8046226: assert(_thread == Thread::current()) failed: thread must be current w/ -XX:+TraceDeoptimization -XX:+Verbose
Reviewed-by: twisti, dcubed, fparain

diff -r 5da2952ec874 -r 83d8425d85a3 hotspot/src/share/vm/runtime/vframe.cpp
--- a/hotspot/src/share/vm/runtime/vframe.cpp	Fri Jun 06 13:31:55 2014 -0700
+++ b/hotspot/src/share/vm/runtime/vframe.cpp	Mon Jun 09 11:49:02 2014 +0000
@@ -274,7 +274,8 @@
   // Get oopmap describing oops and int for current bci
   InterpreterOopMap oop_mask;
   if (TraceDeoptimization && Verbose) {
-    methodHandle m_h(thread(), method());
+    // need the current JavaThread and not thread()
+    methodHandle m_h(Thread::current(), method());
     OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask);
   } else {
     method()->mask_for(bci(), &oop_mask);
@@ -335,7 +336,8 @@
   if (!method()->is_native()) {
     // Get oopmap describing oops and int for current bci
     if (TraceDeoptimization && Verbose) {
-      methodHandle m_h(method());
+      // need the current JavaThread and not thread()
+      methodHandle m_h(Thread::current(), method());
       OopMapCache::compute_one_oop_map(m_h, bci(), &oop_mask);
     } else {
       method()->mask_for(bci(), &oop_mask);