src/share/vm/memory/genCollectedHeap.cpp

rev 8074 : imported patch heap_statics_remove

*** 56,66 ****
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
  #include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp"
  #endif // INCLUDE_ALL_GCS
  
- GenCollectedHeap* GenCollectedHeap::_gch;
  NOT_PRODUCT(size_t GenCollectedHeap::_skip_header_HeapWords = 0;)
  
  // The set of potentially parallel tasks in root scanning.
  enum GCH_strong_roots_tasks {
    GCH_PS_Universe_oops_do,
--- 56,65 ----
*** 124,135 ****
    initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
  
    _rem_set = collector_policy()->create_rem_set(reserved_region());
    set_barrier_set(rem_set()->bs());
  
-   _gch = this;
- 
    ReservedSpace young_rs = heap_rs.first_part(gen_policy()->young_gen_spec()->max_size(), false, false);
    _young_gen = gen_policy()->young_gen_spec()->init(young_rs, 0, rem_set());
    heap_rs = heap_rs.last_part(gen_policy()->young_gen_spec()->max_size());
  
    ReservedSpace old_rs = heap_rs.first_part(gen_policy()->old_gen_spec()->max_size(), false, false);
--- 123,132 ----
*** 1111,1123 ****
    _young_gen->save_marks();
    _old_gen->save_marks();
  }
  
  GenCollectedHeap* GenCollectedHeap::heap() {
!   assert(_gch != NULL, "Uninitialized access to GenCollectedHeap::heap()");
!   assert(_gch->kind() == CollectedHeap::GenCollectedHeap, "not a generational heap");
!   return _gch;
  }
  
  void GenCollectedHeap::prepare_for_compaction() {
    // Start by compacting into same gen.
    CompactPoint cp(_old_gen);
--- 1108,1121 ----
    _young_gen->save_marks();
    _old_gen->save_marks();
  }
  
  GenCollectedHeap* GenCollectedHeap::heap() {
!   GenCollectedHeap* heap = (GenCollectedHeap*)Universe::heap();
!   assert(heap != NULL, "Uninitialized access to GenCollectedHeap::heap()");
!   assert(heap->kind() == CollectedHeap::GenCollectedHeap, "Not a GenCollectedHeap");
!   return heap;
  }
  
  void GenCollectedHeap::prepare_for_compaction() {
    // Start by compacting into same gen.
    CompactPoint cp(_old_gen);