# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1417718126 -3600
# Node ID b6b448a0ff3bd20804adcaf5ff1aec2617d3acee
# Parent  c662bae7db232f682c006fc4ffa33ae88ab8469c
Added UseShenandoahGC to various GC flags consistency checks.

diff -r c662bae7db23 -r b6b448a0ff3b src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Dec 04 18:48:47 2014 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Thu Dec 04 19:35:26 2014 +0100
@@ -1184,7 +1184,7 @@
 }
 
 void Arguments::set_parnew_gc_flags() {
-  assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC,
+  assert(!UseSerialGC && !UseParallelOldGC && !UseParallelGC && !UseG1GC && !UseShenandoahGC,
          "control point invariant");
   assert(UseParNewGC, "Error");
 
@@ -1729,7 +1729,7 @@
 static bool verify_serial_gc_flags() {
   return (UseSerialGC &&
         !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
-          UseParallelGC || UseParallelOldGC));
+          UseParallelGC || UseParallelOldGC || UseShenandoahGC));
 }
 #endif // ASSERT
 #endif // INCLUDE_ALL_GCS
@@ -2104,6 +2104,7 @@
   if (UseConcMarkSweepGC || UseParNewGC) i++;
   if (UseParallelGC || UseParallelOldGC) i++;
   if (UseG1GC)                           i++;
+  if (UseShenandoahGC)                   i++;
   if (i > 1) {
     jio_fprintf(defaultStream::error_stream(),
                 "Conflicting collector combinations in option list; "
diff -r c662bae7db23 -r b6b448a0ff3b src/share/vm/runtime/arguments.hpp
--- a/src/share/vm/runtime/arguments.hpp	Thu Dec 04 18:48:47 2014 +0100
+++ b/src/share/vm/runtime/arguments.hpp	Thu Dec 04 19:35:26 2014 +0100
@@ -614,7 +614,7 @@
 
 bool Arguments::gc_selected() {
   return UseConcMarkSweepGC || UseG1GC || UseParallelGC || UseParallelOldGC ||
-    UseParNewGC || UseSerialGC;
+    UseParNewGC || UseSerialGC || UseShenandoahGC;
 }
 
 bool Arguments::check_gc_consistency_ergo() {