archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8068582: UseSerialGC not always set up properly

Browse source 
Reviewed-by: jmasa, brutisso, sjohanss
This commit is contained in:
Per Lidén 2015-04-20 08:53:08 +02:00
parent 0d5c04e00d
commit e4a699552a
5 changed files with 72 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/share/vm/memory/universe.cpp
View file

@ -714,7 +714,6 @@ jint Universe::initialize_heap() {
fatal("UseG1GC not supported in this VM.");
} else if (UseConcMarkSweepGC) {
fatal("UseConcMarkSweepGC not supported in this VM.");
}
#else
if (UseParallelGC) {
status = Universe::create_heap<ParallelScavengeHeap, GenerationSizer>();
@ -722,12 +721,11 @@ jint Universe::initialize_heap() {
status = Universe::create_heap<G1CollectedHeap, G1CollectorPolicyExt>();
} else if (UseConcMarkSweepGC) {
status = Universe::create_heap<GenCollectedHeap, ConcurrentMarkSweepPolicy>();
}
#endif
else { // UseSerialGC
// Don't assert that UseSerialGC is set here because there are cases
// where no GC it set and we then fall back to using SerialGC.
} else if (UseSerialGC) {
status = Universe::create_heap<GenCollectedHeap, MarkSweepPolicy>();
} else {
ShouldNotReachHere();
}
if (status != JNI_OK) {