diff src/share/vm/runtime/arguments.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 4dba97fb1a6f
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -3667,7 +3667,7 @@
     set_tiered_flags();
   } else {
     // Check if the policy is valid. Policies 0 and 1 are valid for non-tiered setup.
-    if (CompilationPolicyChoice >= 2 GRAAL_ONLY(&& CompilationPolicyChoice < 4)) {
+    if (CompilationPolicyChoice >= 2) {
       vm_exit_during_initialization(
         "Incompatible compilation policy selected", NULL);
     }