src/share/vm/opto/graphKit.cpp

*** 620,634 ****
--- 620,636 ----
    assert(kit->stopped(), "cutout code must stop, throw, return, etc.");
  }
  
  //---------------------------PreserveReexecuteState----------------------------
  PreserveReexecuteState::PreserveReexecuteState(GraphKit* kit) {
+   assert(!kit->stopped(), "must call stopped() before");
    _kit    =    kit;
    _sp     =    kit->sp();
    _reexecute = kit->jvms()->_reexecute;
  }
  PreserveReexecuteState::~PreserveReexecuteState() {
+   if (_kit->stopped()) return;
    _kit->jvms()->_reexecute = _reexecute;
    _kit->set_sp(_sp);
  }
  
  //------------------------------clone_map--------------------------------------
*** 1121,1131 ****
      case T_ARRAY  : // fall through
        type = T_OBJECT;  // simplify further tests
      case T_OBJECT : {
        const Type *t = _gvn.type( value );
  
!       const TypeInstPtr* tp = t->isa_instptr();
        if (tp != NULL && !tp->klass()->is_loaded()
            // Only for do_null_check, not any of its siblings:
            && !assert_null && null_control == NULL) {
          // Usually, any field access or invocation on an unloaded oop type
          // will simply fail to link, since the statically linked class is
--- 1123,1133 ----
      case T_ARRAY  : // fall through
        type = T_OBJECT;  // simplify further tests
      case T_OBJECT : {
        const Type *t = _gvn.type( value );
  
!       const TypeOopPtr* tp = t->isa_oopptr();
        if (tp != NULL && !tp->klass()->is_loaded()
            // Only for do_null_check, not any of its siblings:
            && !assert_null && null_control == NULL) {
          // Usually, any field access or invocation on an unloaded oop type
          // will simply fail to link, since the statically linked class is