# HG changeset patch
# User andrew
# Date 1575844844 0
# Node ID 8c0733543544bbcd32c4404630d764d280299056
# Parent  371da86379cfe27b56e5475846ab137df6314b67# Parent  65749db89e611e333d08c89f8503a6da38e4cab1
Merge

diff -r 371da86379cf -r 8c0733543544 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Wed Dec 04 16:24:15 2019 +0000
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Sun Dec 08 22:40:44 2019 +0000
@@ -376,7 +376,7 @@
                              MAX2((uint) (MaxNewSize / HeapRegion::GrainBytes),
                                   1U);
       _sizer_kind = SizerMaxAndNewSize;
-      _adaptive_size = _min_desired_young_length == _max_desired_young_length;
+      _adaptive_size = _min_desired_young_length != _max_desired_young_length;
     } else {
       _sizer_kind = SizerNewSizeOnly;
     }
diff -r 371da86379cf -r 8c0733543544 src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Wed Dec 04 16:24:15 2019 +0000
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Sun Dec 08 22:40:44 2019 +0000
@@ -133,7 +133,11 @@
   SizerKind _sizer_kind;
   uint _min_desired_young_length;
   uint _max_desired_young_length;
+
+  // False when using a fixed young generation size due to command-line options,
+  // true otherwise.
   bool _adaptive_size;
+
   uint calculate_default_min_length(uint new_number_of_heap_regions);
   uint calculate_default_max_length(uint new_number_of_heap_regions);