Mercurial > hg > graal-jvmci-8
changeset 2239:c08677f98289
6840152: JVM crashes when heavyweight monitors are used
Summary: Turn off biased locking if !UseFastLocking or UseHeavyMonitors options are requested.
Reviewed-by: phh, never, dcubed, dholmes
author | coleenp |
---|---|
date | Wed, 16 Feb 2011 11:34:44 -0500 |
parents | 5415131bc5ab |
children | a959935a5732 |
files | src/share/vm/runtime/arguments.cpp |
diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Wed Feb 16 01:42:00 2011 -0500 +++ b/src/share/vm/runtime/arguments.cpp Wed Feb 16 11:34:44 2011 -0500 @@ -3103,6 +3103,19 @@ // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. set_aggressive_opts_flags(); + // 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 (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { + // flag set to true on command line; warn the user that they + // can't enable biased locking here + warning("Biased Locking is not supported with locking debug flags" + "; ignoring UseBiasedLocking flag." ); + } + UseBiasedLocking = false; + } + #ifdef CC_INTERP // Clear flags not supported by the C++ interpreter FLAG_SET_DEFAULT(ProfileInterpreter, false);