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

rev 11777 : [mq]: gcinterface.patch
rev 11778 : [mq]: service.patch

*** 1994,2007 ****
    if (G1StringDedup::is_enabled()) {
      G1StringDedup::stop();
    }
  }
  
- size_t G1CollectedHeap::conservative_max_heap_alignment() {
-   return HeapRegion::max_region_size();
- }
- 
  void G1CollectedHeap::post_initialize() {
    ref_processing_init();
  }
  
  void G1CollectedHeap::ref_processing_init() {
--- 1994,2003 ----
*** 2690,2700 ****
    const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
    gc_tracer->report_metaspace_summary(when, metaspace_summary);
  }
  
  G1CollectedHeap* G1CollectedHeap::heap() {
!   CollectedHeap* heap = Universe::heap();
    assert(heap != NULL, "Uninitialized access to G1CollectedHeap::heap()");
    assert(heap->kind() == CollectedHeap::G1CollectedHeap, "Not a G1CollectedHeap");
    return (G1CollectedHeap*)heap;
  }
  
--- 2686,2696 ----
    const MetaspaceSummary& metaspace_summary = create_metaspace_summary();
    gc_tracer->report_metaspace_summary(when, metaspace_summary);
  }
  
  G1CollectedHeap* G1CollectedHeap::heap() {
!   CollectedHeap* heap = GC::gc()->heap();
    assert(heap != NULL, "Uninitialized access to G1CollectedHeap::heap()");
    assert(heap->kind() == CollectedHeap::G1CollectedHeap, "Not a G1CollectedHeap");
    return (G1CollectedHeap*)heap;
  }