Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot

changeset 7427:b6b448a0ff3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added UseShenandoahGC to various GC flags consistency checks.
author Roman Kennke <rkennke@redhat.com>
date Thu, 04 Dec 2014 19:35:26 +0100
parents c662bae7db23
children e35e93ed63f6
files src/share/vm/runtime/arguments.cpp src/share/vm/runtime/arguments.hpp
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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; "
--- 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() {