From ec24eb4ebbdb24aa5b67cd6789d88946bb296f24 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 5 Jan 2005 06:09:09 +0100 Subject: [PATCH] natObject.cc (_Jv_ObjectCheckMonitor): Initialize the sync_info element of the object if needed. * java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the sync_info element of the object if needed. From-SVN: r92922 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/natObject.cc | 2 ++ 2 files changed, 7 insertions(+) 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 + + * java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the + sync_info element of the object if needed. + 2005-01-03 Eric Botcazou * 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); } -- 2.30.2