# HG changeset patch
# User iveresov
# Date 1331854736 25200
# Node ID 56ee89841dc4d2124f67f09af18ffe0f7d48e67d
# Parent  dbd21c7c833f162edc301e76264fb3ebfd854e03
7154333: JVM fails to start if -XX:+AggressiveHeap is set
Summary: Don't set CompilationPolicyChoice with AggressiveHeap
Reviewed-by: never

diff -r dbd21c7c833f -r 56ee89841dc4 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Mar 13 20:54:56 2012 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Thu Mar 15 16:38:56 2012 -0700
@@ -2523,15 +2523,6 @@
       // was arrived at by experimenting with specjbb.
       FLAG_SET_CMDLINE(uintx, OldPLABSize, 8*K);  // Note: this is in words
 
-      // CompilationPolicyChoice=0 causes the server compiler to adopt
-      // a more conservative which-method-do-I-compile policy when one
-      // of the counters maintained by the interpreter trips.  The
-      // result is reduced startup time and improved specjbb and
-      // alacrity performance.  Zero is the default, but we set it
-      // explicitly here in case the default changes.
-      // See runtime/compilationPolicy.*.
-      FLAG_SET_CMDLINE(intx, CompilationPolicyChoice, 0);
-
       // Enable parallel GC and adaptive generation sizing
       FLAG_SET_CMDLINE(bool, UseParallelGC, true);
       FLAG_SET_DEFAULT(ParallelGCThreads,