Mercurial > hg > truffle
diff src/share/vm/memory/collectorPolicy.cpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 24 Mar 2014 21:30:43 +0100 |
parents | bac9ef65b71d |
children |
line wrap: on
line diff
--- a/src/share/vm/memory/collectorPolicy.cpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/share/vm/memory/collectorPolicy.cpp Mon Mar 24 21:30:43 2014 +0100 @@ -304,13 +304,10 @@ } // Now take the actual NewSize into account. We will silently increase NewSize - // if the user specified a smaller or unaligned value. + // if the user specified a smaller value. smallest_new_size = MAX2(smallest_new_size, (uintx)align_size_down(NewSize, _gen_alignment)); if (smallest_new_size != NewSize) { - // Do not use FLAG_SET_ERGO to update NewSize here, since this will override - // if NewSize was set on the command line or not. This information is needed - // later when setting the initial and minimum young generation size. - NewSize = smallest_new_size; + FLAG_SET_ERGO(uintx, NewSize, smallest_new_size); } _initial_gen0_size = NewSize;