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

rev 12854 : [mq]: gcinterface.patch

*** 1992,2005 ****
    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() {
--- 1992,2001 ----
*** 2680,2697 ****
    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;
  }
  
  void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
-   // always_do_update_barrier = false;
    assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
  
    double start = os::elapsedTime();
    // Fill TLAB's and such
    accumulate_statistics_all_tlabs();
--- 2676,2692 ----
    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;
  }
  
  void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
    assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
  
    double start = os::elapsedTime();
    // Fill TLAB's and such
    accumulate_statistics_all_tlabs();
*** 2709,2719 ****
    // I'm ignoring the "fill_newgen()" call if "alloc_event_enabled"
    // is set.
  #if defined(COMPILER2) || INCLUDE_JVMCI
    assert(DerivedPointerTable::is_empty(), "derived pointer present");
  #endif
-   // always_do_update_barrier = true;
  
    double start = os::elapsedTime();
    resize_all_tlabs();
    g1_policy()->phase_times()->record_resize_tlab_time_ms((os::elapsedTime() - start) * 1000.0);
  
--- 2704,2713 ----