* 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/branches/gcc-4_7-branch@208493 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aaad183..4632912 100644 (file)
--- 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.
+
 2013-04-11  Release Manager
 
        * GCC 4.7.3 released.

diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 87f2044..1a66640 100644 (file)
--- 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;