comparison src/share/vm/runtime/arguments.cpp @ 4840:0a10d80352d5

Merge
author brutisso
date Fri, 27 Jan 2012 09:04:57 +0100
parents a5244e07b761 31a5b9aad4bc
children 24cae3e4cbaa
comparison
equal deleted inserted replaced
4839:b4ebad3520bb 4840:0a10d80352d5
3162 3162
3163 #ifdef COMPILER2 3163 #ifdef COMPILER2
3164 if (!UseBiasedLocking || EmitSync != 0) { 3164 if (!UseBiasedLocking || EmitSync != 0) {
3165 UseOptoBiasInlining = false; 3165 UseOptoBiasInlining = false;
3166 } 3166 }
3167 if (!EliminateLocks) {
3168 EliminateNestedLocks = false;
3169 }
3167 #endif 3170 #endif
3168 3171
3169 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) { 3172 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
3170 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output"); 3173 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
3171 DebugNonSafepoints = true; 3174 DebugNonSafepoints = true;