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

rev 53382 : [mq]: 8213229-strings-as-weak-during-young-gc
rev 53385 : [mq]: 8217374-rename-g1evacuationinfo

*** 23,42 ****
   */
  
  #ifndef SHARE_GC_G1_G1COLLECTEDHEAP_HPP
  #define SHARE_GC_G1_G1COLLECTEDHEAP_HPP
  
- #include "gc/g1/evacuationInfo.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BiasedArray.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.hpp"
  #include "gc/g1/g1EdenRegions.hpp"
  #include "gc/g1/g1EvacFailure.hpp"
  #include "gc/g1/g1EvacStats.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1HeapTransition.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1HRPrinter.hpp"
  #include "gc/g1/g1InCSetState.hpp"
--- 23,42 ----
   */
  
  #ifndef SHARE_GC_G1_G1COLLECTEDHEAP_HPP
  #define SHARE_GC_G1_G1COLLECTEDHEAP_HPP
  
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BiasedArray.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.hpp"
  #include "gc/g1/g1EdenRegions.hpp"
  #include "gc/g1/g1EvacFailure.hpp"
  #include "gc/g1/g1EvacStats.hpp"
+ #include "gc/g1/g1EvacuationInfo.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1HeapTransition.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1HRPrinter.hpp"
  #include "gc/g1/g1InCSetState.hpp"
*** 733,743 ****
    void evacuate_collection_set(G1ParScanThreadStateSet* per_thread_states);
    void evacuate_optional_collection_set(G1ParScanThreadStateSet* per_thread_states);
    void evacuate_optional_regions(G1ParScanThreadStateSet* per_thread_states, G1OptionalCSet* ocset);
  
    void pre_evacuate_collection_set();
!   void post_evacuate_collection_set(EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
  
    // Print the header for the per-thread termination statistics.
    static void print_termination_stats_hdr();
    // Print actual per-thread termination statistics.
    void print_termination_stats(uint worker_id,
--- 733,743 ----
    void evacuate_collection_set(G1ParScanThreadStateSet* per_thread_states);
    void evacuate_optional_collection_set(G1ParScanThreadStateSet* per_thread_states);
    void evacuate_optional_regions(G1ParScanThreadStateSet* per_thread_states, G1OptionalCSet* ocset);
  
    void pre_evacuate_collection_set();
!   void post_evacuate_collection_set(G1EvacuationInfo& evacuation_info, G1ParScanThreadStateSet* pss);
  
    // Print the header for the per-thread termination statistics.
    static void print_termination_stats_hdr();
    // Print actual per-thread termination statistics.
    void print_termination_stats(uint worker_id,
*** 760,770 ****
    // concurrently after the collection.
    DirtyCardQueueSet _dirty_card_queue_set;
  
    // After a collection pause, convert the regions in the collection set into free
    // regions.
!   void free_collection_set(G1CollectionSet* collection_set, EvacuationInfo& evacuation_info, const size_t* surviving_young_words);
  
    // Abandon the current collection set without recording policy
    // statistics or updating free lists.
    void abandon_collection_set(G1CollectionSet* collection_set);
  
--- 760,770 ----
    // concurrently after the collection.
    DirtyCardQueueSet _dirty_card_queue_set;
  
    // After a collection pause, convert the regions in the collection set into free
    // regions.
!   void free_collection_set(G1CollectionSet* collection_set, G1EvacuationInfo& evacuation_info, const size_t* surviving_young_words);
  
    // Abandon the current collection set without recording policy
    // statistics or updating free lists.
    void abandon_collection_set(G1CollectionSet* collection_set);