src/share/vm/c1/c1_Runtime1.cpp

*** 489,499 ****
      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();
    }
--- 489,498 ----
*** 674,684 ****
    NOT_PRODUCT(_monitorenter_slowcase_cnt++;)
    if (PrintBiasedLockingStatistics) {
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
    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->lock(), true, CHECK);
    } else {
      if (UseFastLocking) {
--- 673,682 ----
*** 699,709 ****
    assert(thread->last_Java_sp(), "last_Java_sp must be set");
    // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown
    EXCEPTION_MARK;
  
    oop obj = lock->obj();
!   assert(obj->is_oop(), "must be NULL or an object");
    if (UseFastLocking) {
      // When using fast locking, the compiled code has already tried the fast case
      ObjectSynchronizer::slow_exit(obj, lock->lock(), THREAD);
    } else {
      ObjectSynchronizer::fast_exit(obj, lock->lock(), THREAD);
--- 697,707 ----
    assert(thread->last_Java_sp(), "last_Java_sp must be set");
    // monitorexit is non-blocking (leaf routine) => no exceptions can be thrown
    EXCEPTION_MARK;
  
    oop obj = lock->obj();
!   assert(oopDesc::is_oop(obj), "must be NULL or an object");
    if (UseFastLocking) {
      // When using fast locking, the compiled code has already tried the fast case
      ObjectSynchronizer::slow_exit(obj, lock->lock(), THREAD);
    } else {
      ObjectSynchronizer::fast_exit(obj, lock->lock(), THREAD);