src/share/vm/jvmci/jvmciRuntime.cpp

*** 237,247 ****
      assert(exception_frame.is_deoptimized_frame(), "must be deopted");
      pc = exception_frame.pc();
    }
  #ifdef ASSERT
    assert(exception.not_null(), "NULL exceptions should be handled by throw_exception");
-   assert(exception->is_oop(), "just checking");
    // Check that exception is a subclass of Throwable, otherwise we have a VerifyError
    if (!(exception->is_a(SystemDictionary::Throwable_klass()))) {
      if (ExitVMOnVerifyError) vm_exit(-1);
      ShouldNotReachHere();
    }
--- 237,246 ----
*** 383,393 ****
    if (PrintBiasedLockingStatistics) {
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
  #endif
    Handle h_obj(thread, obj);
-   assert(h_obj()->is_oop(), "must be NULL or an object");
    if (UseBiasedLocking) {
      // Retry fast entry if bias is revoked to avoid unnecessary inflation
      ObjectSynchronizer::fast_enter(h_obj, lock, true, CHECK);
    } else {
      if (JVMCIUseFastLocking) {
--- 382,391 ----
*** 405,415 ****
    assert(thread->last_Java_sp(), "last_Java_sp must be set");
    // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown
    EXCEPTION_MARK;
  
  #ifdef DEBUG
!   if (!obj->is_oop()) {
      ResetNoHandleMark rhm;
      nmethod* method = thread->last_frame().cb()->as_nmethod_or_null();
      if (method != NULL) {
        tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), p2i(obj));
      }
--- 403,413 ----
    assert(thread->last_Java_sp(), "last_Java_sp must be set");
    // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown
    EXCEPTION_MARK;
  
  #ifdef DEBUG
!   if (!oopDesc::is_oop(obj)) {
      ResetNoHandleMark rhm;
      nmethod* method = thread->last_frame().cb()->as_nmethod_or_null();
      if (method != NULL) {
        tty->print_cr("ERROR in monitorexit in method %s wrong obj " INTPTR_FORMAT, method->name(), p2i(obj));
      }
*** 453,464 ****
  JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, bool as_string, bool newline))
    ttyLocker ttyl;
  
    if (obj == NULL) {
      tty->print("NULL");
!   } else if (obj->is_oop_or_null(true) && (!as_string || !java_lang_String::is_instance(obj))) {
!     if (obj->is_oop_or_null(true)) {
        char buf[O_BUFLEN];
        tty->print("%s@" INTPTR_FORMAT, obj->klass()->name()->as_C_string(buf, O_BUFLEN), p2i(obj));
      } else {
        tty->print(INTPTR_FORMAT, p2i(obj));
      }
--- 451,462 ----
  JRT_LEAF(void, JVMCIRuntime::log_object(JavaThread* thread, oopDesc* obj, bool as_string, bool newline))
    ttyLocker ttyl;
  
    if (obj == NULL) {
      tty->print("NULL");
!   } else if (oopDesc::is_oop_or_null(obj, true) && (!as_string || !java_lang_String::is_instance(obj))) {
!     if (oopDesc::is_oop_or_null(obj, true)) {
        char buf[O_BUFLEN];
        tty->print("%s@" INTPTR_FORMAT, obj->klass()->name()->as_C_string(buf, O_BUFLEN), p2i(obj));
      } else {
        tty->print(INTPTR_FORMAT, p2i(obj));
      }