src/hotspot/share/runtime/thread.cpp

*** 56,10 ***
--- 56,11 ---
  #include "oops/instanceKlass.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/symbol.hpp"
  #include "oops/typeArrayOop.inline.hpp"
+ #include "oops/inlineKlass.hpp"
  #include "oops/verifyOopClosure.hpp"
  #include "prims/jvm_misc.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/jvmtiThreadState.hpp"
  #include "runtime/arguments.hpp"

*** 1635,10 ***
--- 1636,11 ---
    set_entry_point(NULL);
    set_jni_functions(jni_functions());
    set_callee_target(NULL);
    set_vm_result(NULL);
    set_vm_result_2(NULL);
+   set_return_buffered_value(NULL);
    set_vframe_array_head(NULL);
    set_vframe_array_last(NULL);
    set_deferred_locals(NULL);
    set_deopt_mark(NULL);
    set_deopt_compiled_method(NULL);

*** 2840,10 ***
--- 2842,13 ---
  }
  
  void JavaThread::frames_do(void f(frame*, const RegisterMap* map)) {
    // ignore is there is no stack
    if (!has_last_Java_frame()) return;
+   // Because this method is used to verify oops, it must support
+   // oops in buffered values
+ 
    // traverse the stack frames. Starts from top frame.
    for (StackFrameStream fst(this); !fst.is_done(); fst.next()) {
      frame* fr = fst.current();
      f(fr, fst.register_map());
    }