src/share/vm/memory/universe.cpp

rev 8148 : 8068582: UseSerialGC not always set up properly
Reviewed-by:

@@ -712,24 +712,22 @@
     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) {
     status = Universe::create_heap<ParallelScavengeHeap, GenerationSizer>();
   } else if (UseG1GC) {
     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) {
     return status;
   }