*** old/src/share/vm/runtime/frame.cpp	Wed Sep 16 15:19:01 2015
--- new/src/share/vm/runtime/frame.cpp	Wed Sep 16 15:19:01 2015

*** 659,671 ****
--- 659,678 ----
      } else if (_cb->is_nmethod()) {
        nmethod* nm = (nmethod*)_cb;
        Method* m = nm->method();
        if (m != NULL) {
          m->name_and_sig_as_C_string(buf, buflen);
-         st->print("J %d%s %s %s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
                    nm->compile_id(), (nm->is_osr_method() ? "%" : ""),
!                   ((nm->compiler() != NULL) ? nm->compiler()->name() : ""),
!                   ((nm->compiler() != NULL) ? nm->compiler()->name() : ""));
+ #if INCLUDE_JVMCI
+         char* jvmciName = nm->jvmci_installed_code_name(buf, buflen);
+         if (jvmciName != NULL) {
+           st->print(" (%s)", jvmciName);
+         }
+ #endif
+         st->print("%s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
                    buf, m->code_size(), _pc, _cb->code_begin(), _pc - _cb->code_begin());
        } else {
          st->print("J  " PTR_FORMAT, pc());
        }
      } else if (_cb->is_runtime_stub()) {

*** 1218,1228 ****
--- 1225,1237 ----
        // fetch the receiver
        oop* p = (oop*) interpreter_frame_local_at(0);
        // make sure we have the right receiver type
      }
    }
    COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(), "must be empty before verify");)
+ #if defined(COMPILER2) || INCLUDE_JVMCI
+   assert(DerivedPointerTable::is_empty(), "must be empty before verify");
+ #endif
    oops_do_internal(&VerifyOopClosure::verify_oop, NULL, NULL, (RegisterMap*)map, false);
  }
  
  
  #ifdef ASSERT