src/share/vm/gc/g1/g1ParScanThreadState.inline.hpp

rev 9605 : imported patch in-cset-ext

*** 48,59 ****
      }
      oopDesc::encode_store_heap_oop(p, obj);
    } else if (in_cset_state.is_humongous()) {
      _g1h->set_humongous_is_live(obj);
    } else {
!     assert(!in_cset_state.is_in_cset_or_humongous(),
!            "In_cset_state must be NotInCSet here, but is " CSETSTATE_FORMAT, in_cset_state.value());
    }
  
    assert(obj != NULL, "Must be");
    update_rs(from, p, obj);
  }
--- 48,59 ----
      }
      oopDesc::encode_store_heap_oop(p, obj);
    } else if (in_cset_state.is_humongous()) {
      _g1h->set_humongous_is_live(obj);
    } else {
!     assert(in_cset_state.is_default() || in_cset_state.is_ext(),
!            "In_cset_state must be NotInCSet or Ext here, but is " CSETSTATE_FORMAT, in_cset_state.value());
    }
  
    assert(obj != NULL, "Must be");
    update_rs(from, p, obj);
  }