archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Karen Kinnear 2011-03-07 09:16:08 -08:00
commit 224db84b31
10 changed files with 65 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -3110,7 +3110,11 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
// Turn off biased locking for locking debug mode flags,
// which are subtlely different from each other but neither works with
// biased locking.
if (!UseFastLocking || UseHeavyMonitors) {
if (UseHeavyMonitors
#ifdef COMPILER1
|| !UseFastLocking
#endif // COMPILER1
) {
if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
// flag set to true on command line; warn the user that they
// can't enable biased locking here