Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 2355:799d8ccf63cf
Merge
author | jrose |
---|---|
date | Fri, 11 Mar 2011 21:19:15 -0800 |
parents | 0cd0a06d2535 5d8f5a6dced7 |
children | 048f98400b8e |
comparison
equal
deleted
inserted
replaced
2336:df1347358fe6 | 2355:799d8ccf63cf |
---|---|
1024 } | 1024 } |
1025 #endif | 1025 #endif |
1026 } | 1026 } |
1027 | 1027 |
1028 void Arguments::set_tiered_flags() { | 1028 void Arguments::set_tiered_flags() { |
1029 // With tiered, set default policy to AdvancedThresholdPolicy, which is 3. | |
1029 if (FLAG_IS_DEFAULT(CompilationPolicyChoice)) { | 1030 if (FLAG_IS_DEFAULT(CompilationPolicyChoice)) { |
1030 FLAG_SET_DEFAULT(CompilationPolicyChoice, 2); | 1031 FLAG_SET_DEFAULT(CompilationPolicyChoice, 3); |
1031 } | 1032 } |
1032 if (CompilationPolicyChoice < 2) { | 1033 if (CompilationPolicyChoice < 2) { |
1033 vm_exit_during_initialization( | 1034 vm_exit_during_initialization( |
1034 "Incompatible compilation policy selected", NULL); | 1035 "Incompatible compilation policy selected", NULL); |
1035 } | 1036 } |