src/hotspot/share/memory/universe.cpp
changeset 47819 ee36a8e36561
parent 47634 6a0c42c40cd1
child 47913 cde4a65ba47d
equal deleted inserted replaced
47818:2f6ab27efb60 47819:ee36a8e36561
    30 #include "classfile/stringTable.hpp"
    30 #include "classfile/stringTable.hpp"
    31 #include "classfile/systemDictionary.hpp"
    31 #include "classfile/systemDictionary.hpp"
    32 #include "classfile/vmSymbols.hpp"
    32 #include "classfile/vmSymbols.hpp"
    33 #include "code/codeCache.hpp"
    33 #include "code/codeCache.hpp"
    34 #include "code/dependencies.hpp"
    34 #include "code/dependencies.hpp"
       
    35 #include "gc/serial/serialHeap.hpp"
    35 #include "gc/shared/cardTableModRefBS.hpp"
    36 #include "gc/shared/cardTableModRefBS.hpp"
    36 #include "gc/shared/collectedHeap.inline.hpp"
    37 #include "gc/shared/collectedHeap.inline.hpp"
    37 #include "gc/shared/gcLocker.inline.hpp"
    38 #include "gc/shared/gcLocker.inline.hpp"
    38 #include "gc/shared/genCollectedHeap.hpp"
       
    39 #include "gc/shared/generation.hpp"
    39 #include "gc/shared/generation.hpp"
    40 #include "gc/shared/gcTraceTime.inline.hpp"
    40 #include "gc/shared/gcTraceTime.inline.hpp"
    41 #include "gc/shared/space.hpp"
    41 #include "gc/shared/space.hpp"
    42 #include "interpreter/interpreter.hpp"
    42 #include "interpreter/interpreter.hpp"
    43 #include "logging/log.hpp"
    43 #include "logging/log.hpp"
   760     return Universe::create_heap_with_policy<G1CollectedHeap, G1CollectorPolicy>();
   760     return Universe::create_heap_with_policy<G1CollectedHeap, G1CollectorPolicy>();
   761   } else if (UseConcMarkSweepGC) {
   761   } else if (UseConcMarkSweepGC) {
   762     return Universe::create_heap_with_policy<CMSHeap, ConcurrentMarkSweepPolicy>();
   762     return Universe::create_heap_with_policy<CMSHeap, ConcurrentMarkSweepPolicy>();
   763 #endif
   763 #endif
   764   } else if (UseSerialGC) {
   764   } else if (UseSerialGC) {
   765     return Universe::create_heap_with_policy<GenCollectedHeap, MarkSweepPolicy>();
   765     return Universe::create_heap_with_policy<SerialHeap, MarkSweepPolicy>();
   766   }
   766   }
   767 
   767 
   768   ShouldNotReachHere();
   768   ShouldNotReachHere();
   769   return NULL;
   769   return NULL;
   770 }
   770 }