Mercurial > hg > truffle
diff src/share/vm/runtime/biasedLocking.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | 3205e78d8193 |
children | 3df21373e577 |
line wrap: on
line diff
--- a/src/share/vm/runtime/biasedLocking.cpp Mon Mar 24 10:48:44 2014 -0700 +++ b/src/share/vm/runtime/biasedLocking.cpp Wed Mar 26 18:21:05 2014 -0700 @@ -233,8 +233,10 @@ // Fix up highest lock to contain displaced header and point // object at it highest_lock->set_displaced_header(unbiased_prototype); - // Reset object header to point to displaced mark - obj->set_mark(markOopDesc::encode(highest_lock)); + // Reset object header to point to displaced mark. + // Must release storing the lock address for platforms without TSO + // ordering (e.g. ppc). + obj->release_set_mark(markOopDesc::encode(highest_lock)); assert(!obj->mark()->has_bias_pattern(), "illegal mark state: stack lock used bias bit"); if (TraceBiasedLocking && (Verbose || !is_bulk)) { tty->print_cr(" Revoked bias of currently-locked object");