src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

rev 8069 : imported patch g1_cleanup

*** 3315,3324 ****
--- 3315,3326 ----
    heap_region_iterate(&cl);
  }
  #endif // PRODUCT
  
  G1CollectedHeap* G1CollectedHeap::heap() {
+   assert(_g1h != NULL, "Uninitialized access to G1CollectedHeap::heap()");
+   assert(_g1h->kind() == CollectedHeap::G1CollectedHeap, "Not a G1 heap");
    return _g1h;
  }
  
  void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
    // always_do_update_barrier = false;