diff options
| author | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-11 16:41:07 +0000 |
|---|---|---|
| committer | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-03-11 16:41:07 +0000 |
| commit | 6b4a1bd636a63c13a8762074c2a811c24594d2b7 (patch) | |
| tree | 1d05c701534e2e1a0bdfe90386eb8f1dbaa58a73 /libjava/java/lang/natObject.cc | |
| parent | 9bf3eaad4ecd43b4d4ab1eb74ac57d34478e83f6 (diff) | |
| download | gcc-6b4a1bd636a63c13a8762074c2a811c24594d2b7.tar.gz | |
* java/lang/natObject.cc (_Jv_MonitorEnter): Add missing parenthesis
around comparison with (address | LOCKED) in JvAssert.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208489 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/natObject.cc')
| -rw-r--r-- | libjava/java/lang/natObject.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 87f2044dd86..1a666407a66 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; |