*** old/src/share/vm/runtime/rframe.cpp	Tue Jun 30 13:11:13 2015
--- new/src/share/vm/runtime/rframe.cpp	Tue Jun 30 13:11:13 2015

*** 50,65 ****
--- 50,65 ----
  
  InterpretedRFrame::InterpretedRFrame(frame fr, JavaThread* thread, RFrame*const callee)
  : RFrame(fr, thread, callee) {
    RegisterMap map(thread, false);
    _vf     = javaVFrame::cast(vframe::new_vframe(&_fr, &map, thread));
!   _method = methodHandle(thread, _vf->method());
    assert(   _vf->is_interpreted_frame(), "must be interpreted");
    init();
  }
  
! InterpretedRFrame::InterpretedRFrame(frame fr, JavaThread* thread, methodHandle m)
! InterpretedRFrame::InterpretedRFrame(frame fr, JavaThread* thread, Method* m)
  : RFrame(fr, thread, NULL) {
    RegisterMap map(thread, false);
    _vf     = javaVFrame::cast(vframe::new_vframe(&_fr, &map, thread));
    _method = m;
  

*** 138,149 ****
--- 138,149 ----
    vframe* vf = vframe::new_vframe(&_fr, &map, thread());
    assert(vf->is_compiled_frame(), "must be compiled");
    _nm = compiledVFrame::cast(vf)->code();
    vf = vf->top();
    _vf = javaVFrame::cast(vf);
!   _method = methodHandle(thread(), CodeCache::find_nmethod(_fr.pc())->method());
-   assert(_method(), "should have found a method");
!   assert(_method, "should have found a method");
  #ifndef PRODUCT
    _invocations = _method->compiled_invocation_count();
  #endif
  }