From e24e31ef9659afb9808d334d62158feef9c5f6f4 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 11 Mar 2014 17:41:07 +0100 Subject: natObject.cc (_Jv_MonitorEnter): Add missing parenthesis around comparison with (address | LOCKED) in JvAssert. * java/lang/natObject.cc (_Jv_MonitorEnter): Add missing parenthesis around comparison with (address | LOCKED) in JvAssert. From-SVN: r208489 --- libjava/java/lang/natObject.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 87f2044..1a66640 100644 --- a/libjava/java/lang/natObject.cc +++ b/libjava/java/lang/natObject.cc @@ -929,7 +929,7 @@ retry: // only be held by other threads waiting for conversion, and // they, like us, drop it quickly without blocking. _Jv_MutexLock(&(hl->si.mutex)); - JvAssert(he -> address == address | LOCKED ); + JvAssert(he -> address == (address | LOCKED)); release_set(&(he -> address), (address | REQUEST_CONVERSION | HEAVY)); // release lock on he LOG(REQ_CONV, (address | REQUEST_CONVERSION | HEAVY), self); @@ -961,7 +961,7 @@ retry: } obj_addr_t was_heavy = (address & HEAVY); if ((address & LOCKED) || - !compare_and_swap(&(he -> address), address, (address | LOCKED ))) + !compare_and_swap(&(he -> address), address, address | LOCKED )) { wait_unlocked(he); goto retry; -- cgit v1.1