Mercurial > hg > graal-compiler
diff src/share/vm/runtime/arguments.cpp @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | 5d0bb7d52783 |
children | 291ffc492eb6 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri Dec 14 12:05:35 2012 +0100 +++ b/src/share/vm/runtime/arguments.cpp Fri Dec 14 13:02:49 2012 +0100 @@ -3442,9 +3442,12 @@ // which are subtlely different from each other but neither works with // biased locking. if (UseHeavyMonitors -#if defined(COMPILER1) || defined(GRAAL) +#ifdef COMPILER1 || !UseFastLocking #endif // COMPILER1 +#ifdef GRAAL + || !GraalUseFastLocking +#endif // GRAAL ) { if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { // flag set to true on command line; warn the user that they