Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 2273:2ab52cda08e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with OpenJDK.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Thu, 03 Mar 2011 19:25:53 +0100
parents d25d4ca69222 f77b3ec064b0
children 29246b1d2d3c
comparison
equal deleted inserted replaced
2219:0a14ff0a8cc4 2273:2ab52cda08e5
1414 #ifdef _LP64 1414 #ifdef _LP64
1415 // Check that UseCompressedOops can be set with the max heap size allocated 1415 // Check that UseCompressedOops can be set with the max heap size allocated
1416 // by ergonomics. 1416 // by ergonomics.
1417 if (MaxHeapSize <= max_heap_for_compressed_oops()) { 1417 if (MaxHeapSize <= max_heap_for_compressed_oops()) {
1418 #if !defined(COMPILER1) || defined(TIERED) 1418 #if !defined(COMPILER1) || defined(TIERED)
1419 if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) { 1419 if (FLAG_IS_DEFAULT(UseCompressedOops)) {
1420 FLAG_SET_ERGO(bool, UseCompressedOops, true); 1420 FLAG_SET_ERGO(bool, UseCompressedOops, true);
1421 } 1421 }
1422 #endif 1422 #endif
1423 #ifdef _WIN64 1423 #ifdef _WIN64
1424 if (UseLargePages && UseCompressedOops) { 1424 if (UseLargePages && UseCompressedOops) {
3143 set_bytecode_flags(); 3143 set_bytecode_flags();
3144 3144
3145 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. 3145 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled.
3146 set_aggressive_opts_flags(); 3146 set_aggressive_opts_flags();
3147 3147
3148 // Turn off biased locking for locking debug mode flags,
3149 // which are subtlely different from each other but neither works with
3150 // biased locking.
3151 if (!UseFastLocking || UseHeavyMonitors) {
3152 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
3153 // flag set to true on command line; warn the user that they
3154 // can't enable biased locking here
3155 warning("Biased Locking is not supported with locking debug flags"
3156 "; ignoring UseBiasedLocking flag." );
3157 }
3158 UseBiasedLocking = false;
3159 }
3160
3148 #ifdef CC_INTERP 3161 #ifdef CC_INTERP
3149 // Clear flags not supported by the C++ interpreter 3162 // Clear flags not supported by the C++ interpreter
3150 FLAG_SET_DEFAULT(ProfileInterpreter, false); 3163 FLAG_SET_DEFAULT(ProfileInterpreter, false);
3151 FLAG_SET_DEFAULT(UseBiasedLocking, false); 3164 FLAG_SET_DEFAULT(UseBiasedLocking, false);
3152 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); 3165 LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));