diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2014-03-11 17:41:07 +0100 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2014-03-11 17:41:07 +0100 |
| commit | e24e31ef9659afb9808d334d62158feef9c5f6f4 (patch) | |
| tree | 1d05c701534e2e1a0bdfe90386eb8f1dbaa58a73 /libjava | |
| parent | bae56bbbeab4b32d034a8e24ba5a41ddc19facbd (diff) | |
| download | gcc-e24e31ef9659afb9808d334d62158feef9c5f6f4.zip gcc-e24e31ef9659afb9808d334d62158feef9c5f6f4.tar.gz gcc-e24e31ef9659afb9808d334d62158feef9c5f6f4.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natObject.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 93fb0d2..2846872 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2014-03-11 Uros Bizjak <ubizjak@gmail.com> + + * java/lang/natObject.cc (_Jv_MonitorEnter): Add missing parenthesis + around comparison with (address | LOCKED) in JvAssert. + 2014-02-20 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libgcj/55637 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; |