diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-05 05:09:09 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-01-05 05:09:09 +0000 |
| commit | ff503af38b881f550c5b7ae079c276454f19ae08 (patch) | |
| tree | 90f10e8b66126b935b49e0bb9f38a63cd100fc20 /libjava | |
| parent | 12d7523c344cb89785d92073037c062f3b487b15 (diff) | |
| download | ppe42-gcc-ff503af38b881f550c5b7ae079c276454f19ae08.tar.gz ppe42-gcc-ff503af38b881f550c5b7ae079c276454f19ae08.zip | |
* java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the
sync_info element of the object if needed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92922 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natObject.cc | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6db73b18b3a..90d2fe4bde9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-01-05 Eric Botcazou <ebotcazou@libertysurf.fr> + + * java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the + sync_info element of the object if needed. + 2005-01-03 Eric Botcazou <ebotcazou@libertysurf.fr> * testsuite/libjava.lang/Process_4.java (Process_4): Expect only diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 7dff626cd85..d7b67d7fa2d 100644 --- a/libjava/java/lang/natObject.cc +++ b/libjava/java/lang/natObject.cc @@ -267,6 +267,8 @@ _Jv_MonitorExit (jobject obj) bool _Jv_ObjectCheckMonitor (jobject obj) { + if (__builtin_expect (INIT_NEEDED (obj), false)) + obj->sync_init (); _Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info; return _Jv_MutexCheckMonitor (&si->mutex); } |
