diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-02-10 04:13:42 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-02-10 04:13:42 -0800 |
| commit | 9547f24e09cb9cf4db70f0ad308d2f03015c7d81 (patch) | |
| tree | 16b168d8b010c84e72d37f9aa22e216d5a2a8b3d /libjava/java/lang/natObject.cc | |
| parent | 5a28f86b322357cb07d2ae3a42fa39f0749cf9f2 (diff) | |
| parent | ae10eb82fe34c18640ad65c2ab94ffc53f349315 (diff) | |
| download | gcc-9547f24e09cb9cf4db70f0ad308d2f03015c7d81.tar.gz | |
Merge remote-tracking branch 'origin/gcc-4_7-branch' into hjl/x32/gcc-4_7-branchhjl/x32/gcc-4_7-branch
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; |