src/hotspot/share/memory/universe.cpp

rev 47829 : 8189389: Move heap creation into GC interface

*** 30,42 ****
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/dependencies.hpp"
- #include "gc/serial/serialHeap.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/gcLocker.inline.hpp"
  #include "gc/shared/generation.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/space.hpp"
  #include "interpreter/interpreter.hpp"
--- 30,42 ----
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/dependencies.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
+ #include "gc/shared/gcArguments.hpp"
  #include "gc/shared/gcLocker.inline.hpp"
  #include "gc/shared/generation.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/space.hpp"
  #include "interpreter/interpreter.hpp"
*** 80,97 ****
  #include "utilities/formatBuffer.hpp"
  #include "utilities/hashtable.inline.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/ostream.hpp"
  #include "utilities/preserveException.hpp"
- #if INCLUDE_ALL_GCS
- #include "gc/cms/cmsCollectorPolicy.hpp"
- #include "gc/cms/cmsHeap.hpp"
- #include "gc/g1/g1CollectedHeap.inline.hpp"
- #include "gc/g1/g1CollectorPolicy.hpp"
- #include "gc/parallel/parallelScavengeHeap.hpp"
- #include "gc/shared/adaptiveSizePolicy.hpp"
- #endif // INCLUDE_ALL_GCS
  #if INCLUDE_CDS
  #include "classfile/sharedClassUtil.hpp"
  #endif
  
  // Known objects
--- 80,89 ----
*** 744,774 ****
    return JNI_OK;
  }
  
  CollectedHeap* Universe::create_heap() {
    assert(_collectedHeap == NULL, "Heap already created");
! #if !INCLUDE_ALL_GCS
!   if (UseParallelGC) {
!     fatal("UseParallelGC not supported in this VM.");
!   } else if (UseG1GC) {
!     fatal("UseG1GC not supported in this VM.");
!   } else if (UseConcMarkSweepGC) {
!     fatal("UseConcMarkSweepGC not supported in this VM.");
! #else
!   if (UseParallelGC) {
!     return Universe::create_heap_with_policy<ParallelScavengeHeap, GenerationSizer>();
!   } else if (UseG1GC) {
!     return Universe::create_heap_with_policy<G1CollectedHeap, G1CollectorPolicy>();
!   } else if (UseConcMarkSweepGC) {
!     return Universe::create_heap_with_policy<CMSHeap, ConcurrentMarkSweepPolicy>();
! #endif
!   } else if (UseSerialGC) {
!     return Universe::create_heap_with_policy<SerialHeap, MarkSweepPolicy>();
!   }
! 
!   ShouldNotReachHere();
!   return NULL;
  }
  
  // Choose the heap base address and oop encoding mode
  // when compressed oops are used:
  // Unscaled  - Use 32-bits oops without encoding when
--- 736,747 ----
    return JNI_OK;
  }
  
  CollectedHeap* Universe::create_heap() {
    assert(_collectedHeap == NULL, "Heap already created");
!   assert(GCArguments::is_initialized(), "GC must be initialized here");
!   return GCArguments::arguments()->create_heap();
  }
  
  // Choose the heap base address and oop encoding mode
  // when compressed oops are used:
  // Unscaled  - Use 32-bits oops without encoding when