Mercurial > hg > truffle

diff src/share/vm/runtime/arguments.cpp @ 7154:5d0bb7d52783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
author Doug Simon <doug.simon@oracle.com>
date Wed, 12 Dec 2012 21:36:40 +0100
parents 1baf7f1e3f23
children 291ffc492eb6
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Wed Dec 12 15:46:11 2012 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Wed Dec 12 21:36:40 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