aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.8/libjava/java/lang/natObject.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.8/libjava/java/lang/natObject.cc')
-rw-r--r--gcc-4.8/libjava/java/lang/natObject.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.8/libjava/java/lang/natObject.cc b/gcc-4.8/libjava/java/lang/natObject.cc
index 87f2044dd..1a666407a 100644
--- a/gcc-4.8/libjava/java/lang/natObject.cc
+++ b/gcc-4.8/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;