Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author brutisso
date Fri, 27 Jan 2012 09:04:57 +0100
parents a5244e07b761 31a5b9aad4bc
children 24cae3e4cbaa
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Jan 26 14:14:55 2012 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Fri Jan 27 09:04:57 2012 +0100
@@ -3164,6 +3164,9 @@
   if (!UseBiasedLocking || EmitSync != 0) {
     UseOptoBiasInlining = false;
   }
+  if (!EliminateLocks) {
+    EliminateNestedLocks = false;
+  }
 #endif
 
   if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {