*** old/src/share/vm/classfile/javaClasses.cpp	Thu Jul 17 13:48:39 2014
--- new/src/share/vm/classfile/javaClasses.cpp	Thu Jul 17 13:48:36 2014

*** 1637,1649 ****
--- 1637,1649 ----
        bci = stream.read_bci();
      } else {
        if (fr.is_first_frame()) break;
        address pc = fr.pc();
        if (fr.is_interpreted_frame()) {
!         intptr_t bcx = fr.interpreter_frame_bcx();
!         address bcp = fr.interpreter_frame_bcp();
          method = fr.interpreter_frame_method();
!         bci =  fr.is_bci(bcx) ? bcx : method->bci_from((address)bcx);
!         bci =  method->bci_from(bcp);
          fr = fr.sender(&map);
        } else {
          CodeBlob* cb = fr.cb();
          // HMMM QQQ might be nice to have frame return nm as NULL if cb is non-NULL
          // but non nmethod