OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: r208493
This commit is contained in:
Uros Bizjak 2014-03-11 19:58:16 +01:00 committed by Uros Bizjak
parent b55ab6bf15
commit 3e0d3dc28d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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.

4
libjava/java/lang/natObject.cc
View File

@ -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;