src/hotspot/share/gc/g1/g1CollectedHeap.hpp

rev 52310 : imported patch 8071913-almost-done
rev 52312 : imported patch 6490394-uncommit-at-remark

*** 466,478 ****
                            bool clear_all_soft_refs);
  
    // Callback from VM_G1CollectFull operation, or collect_as_vm_thread.
    virtual void do_full_collection(bool clear_all_soft_refs);
  
-   // Resize the heap if necessary after a full collection.
-   void resize_if_necessary_after_full_collection();
- 
    // Callback from VM_G1CollectForAllocation operation.
    // This function does everything necessary/possible to satisfy a
    // failed allocation request (including collection, expansion, etc.)
    HeapWord* satisfy_failed_allocation(size_t word_size,
                                        bool* succeeded);
--- 466,475 ----
*** 526,535 ****
--- 523,534 ----
    G1MonitoringSupport* g1mm() {
      assert(_g1mm != NULL, "should have been initialized");
      return _g1mm;
    }
  
+   void resize_heap_if_necessary();
+   
    // Expand the garbage-first heap by at least the given size (in bytes!).
    // Returns true if the heap was expanded by the requested amount;
    // false otherwise.
    // (Rounds up to a HeapRegion boundary.)
    bool expand(size_t expand_bytes, WorkGang* pretouch_workers = NULL, double* expand_time_ms = NULL);