2005-08-12 Morgan Deters <mdeters@morgandeters.com>

	PR libgcj/23353:
	* java/lang/natObject.cc (clone): Clear sync_info.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103039 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6d235808940ca4a96ccbf13be808efa8dcbcfc4f..f5a9dbba23268a0bcbb370804748b0b6884304c2 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-12  Morgan Deters  <mdeters@morgandeters.com>
+
+       PR libgcj/23353:
+       * java/lang/natObject.cc (clone): Clear sync_info.
+
 2005-07-26  Tom Tromey  <tromey@redhat.com>
 
        * gnu/java/net/protocol/ftp/package.html,

diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index aa79500fa585ca8603f6f946a5a216158e00bc9b..87f2044dd86a628dbad8faa77b81adb20d3f32fe 100644 (file)
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -1,6 +1,6 @@
 // natObject.cc - Implementation of the Object class.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -104,6 +104,11 @@ java::lang::Object::clone (void)
     }
 
   memcpy ((void *) r, (void *) this, size);
+#ifndef JV_HASH_SYNCHRONIZATION
+  // Guarantee that the locks associated to the two objects are
+  // distinct.
+  r->sync_info = NULL;
+#endif
   return r;
 }