Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 7226:8a3efb8c831d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents 5d0bb7d52783
children 291ffc492eb6
comparison
equal deleted inserted replaced
7225:31c4d9f9e922 7226:8a3efb8c831d
3440 3440
3441 // Turn off biased locking for locking debug mode flags, 3441 // Turn off biased locking for locking debug mode flags,
3442 // which are subtlely different from each other but neither works with 3442 // which are subtlely different from each other but neither works with
3443 // biased locking. 3443 // biased locking.
3444 if (UseHeavyMonitors 3444 if (UseHeavyMonitors
3445 #if defined(COMPILER1) || defined(GRAAL) 3445 #ifdef COMPILER1
3446 || !UseFastLocking 3446 || !UseFastLocking
3447 #endif // COMPILER1 3447 #endif // COMPILER1
3448 #ifdef GRAAL
3449 || !GraalUseFastLocking
3450 #endif // GRAAL
3448 ) { 3451 ) {
3449 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { 3452 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
3450 // flag set to true on command line; warn the user that they 3453 // flag set to true on command line; warn the user that they
3451 // can't enable biased locking here 3454 // can't enable biased locking here
3452 warning("Biased Locking is not supported with locking debug flags" 3455 warning("Biased Locking is not supported with locking debug flags"