src/share/vm/interpreter/interpreterRuntime.cpp

rev 12310 : [mq]: gcinterface.patch

*** 639,657 ****
  #endif
    if (PrintBiasedLockingStatistics) {
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
    Handle h_obj(thread, elem->obj());
!   assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (UseBiasedLocking) {
      // Retry fast entry if bias is revoked to avoid unnecessary inflation
      ObjectSynchronizer::fast_enter(h_obj, elem->lock(), true, CHECK);
    } else {
      ObjectSynchronizer::slow_enter(h_obj, elem->lock(), CHECK);
    }
!   assert(Universe::heap()->is_in_reserved_or_null(elem->obj()),
           "must be NULL or an object");
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
  IRT_END
--- 639,657 ----
  #endif
    if (PrintBiasedLockingStatistics) {
      Atomic::inc(BiasedLocking::slow_path_entry_count_addr());
    }
    Handle h_obj(thread, elem->obj());
!   assert(GC::gc()->heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (UseBiasedLocking) {
      // Retry fast entry if bias is revoked to avoid unnecessary inflation
      ObjectSynchronizer::fast_enter(h_obj, elem->lock(), true, CHECK);
    } else {
      ObjectSynchronizer::slow_enter(h_obj, elem->lock(), CHECK);
    }
!   assert(GC::gc()->heap()->is_in_reserved_or_null(elem->obj()),
           "must be NULL or an object");
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
  IRT_END
*** 661,671 ****
  IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorexit(JavaThread* thread, BasicObjectLock* elem))
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
    Handle h_obj(thread, elem->obj());
!   assert(Universe::heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (elem == NULL || h_obj()->is_unlocked()) {
      THROW(vmSymbols::java_lang_IllegalMonitorStateException());
    }
    ObjectSynchronizer::slow_exit(h_obj(), elem->lock(), thread);
--- 661,671 ----
  IRT_ENTRY_NO_ASYNC(void, InterpreterRuntime::monitorexit(JavaThread* thread, BasicObjectLock* elem))
  #ifdef ASSERT
    thread->last_frame().interpreter_frame_verify_monitor(elem);
  #endif
    Handle h_obj(thread, elem->obj());
!   assert(GC::gc()->heap()->is_in_reserved_or_null(h_obj()),
           "must be NULL or an object");
    if (elem == NULL || h_obj()->is_unlocked()) {
      THROW(vmSymbols::java_lang_IllegalMonitorStateException());
    }
    ObjectSynchronizer::slow_exit(h_obj(), elem->lock(), thread);
*** 726,739 ****
      methodHandle m (thread, method(thread));
      Bytecode_invoke call(m, bci(thread));
      Symbol* signature = call.signature();
      receiver = Handle(thread,
                    thread->last_frame().interpreter_callee_receiver(signature));
!     assert(Universe::heap()->is_in_reserved_or_null(receiver()),
             "sanity check");
      assert(receiver.is_null() ||
!            !Universe::heap()->is_in_reserved(receiver->klass()),
             "sanity check");
    }
  
    // resolve method
    CallInfo info;
--- 726,739 ----
      methodHandle m (thread, method(thread));
      Bytecode_invoke call(m, bci(thread));
      Symbol* signature = call.signature();
      receiver = Handle(thread,
                    thread->last_frame().interpreter_callee_receiver(signature));
!     assert(GC::gc()->heap()->is_in_reserved_or_null(receiver()),
             "sanity check");
      assert(receiver.is_null() ||
!            !GC::gc()->heap()->is_in_reserved(receiver->klass()),
             "sanity check");
    }
  
    // resolve method
    CallInfo info;