comparison src/share/vm/runtime/arguments.cpp @ 7479:f1c06dcee0b5

Merge
author kvn
date Thu, 10 Jan 2013 10:00:43 -0800
parents b2fef6b220e9 d092d1b31229
children 989155e2d07a c73c3f2c5b3b db9981fd3124
comparison
equal deleted inserted replaced
7472:b2fef6b220e9 7479:f1c06dcee0b5
3301 UseOptoBiasInlining = false; 3301 UseOptoBiasInlining = false;
3302 } 3302 }
3303 if (!EliminateLocks) { 3303 if (!EliminateLocks) {
3304 EliminateNestedLocks = false; 3304 EliminateNestedLocks = false;
3305 } 3305 }
3306 if (!Inline) {
3307 IncrementalInline = false;
3308 }
3309 #ifndef PRODUCT
3310 if (!IncrementalInline) {
3311 AlwaysIncrementalInline = false;
3312 }
3313 #endif
3314 if (IncrementalInline && FLAG_IS_DEFAULT(MaxNodeLimit)) {
3315 // incremental inlining: bump MaxNodeLimit
3316 FLAG_SET_DEFAULT(MaxNodeLimit, (intx)75000);
3317 }
3306 #endif 3318 #endif
3307 3319
3308 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) { 3320 if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {
3309 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output"); 3321 warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output");
3310 DebugNonSafepoints = true; 3322 DebugNonSafepoints = true;