comparison 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
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
3665 3665
3666 if (TieredCompilation) { 3666 if (TieredCompilation) {
3667 set_tiered_flags(); 3667 set_tiered_flags();
3668 } else { 3668 } else {
3669 // Check if the policy is valid. Policies 0 and 1 are valid for non-tiered setup. 3669 // Check if the policy is valid. Policies 0 and 1 are valid for non-tiered setup.
3670 if (CompilationPolicyChoice >= 2 GRAAL_ONLY(&& CompilationPolicyChoice < 4)) { 3670 if (CompilationPolicyChoice >= 2) {
3671 vm_exit_during_initialization( 3671 vm_exit_during_initialization(
3672 "Incompatible compilation policy selected", NULL); 3672 "Incompatible compilation policy selected", NULL);
3673 } 3673 }
3674 } 3674 }
3675 3675