Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/biasedLocking.cpp @ 14465:28f281e8de1d
Merge
author | kvn |
---|---|
date | Thu, 20 Feb 2014 12:20:56 -0800 |
parents | 3205e78d8193 |
children | 3df21373e577 |
line wrap: on
line diff
--- a/src/share/vm/runtime/biasedLocking.cpp Tue Feb 18 09:54:24 2014 -0500 +++ b/src/share/vm/runtime/biasedLocking.cpp Thu Feb 20 12:20:56 2014 -0800 @@ -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");