Author: robertj
Date: 2006-01-18 10:20:23 -0500 (Wed, 18 Jan 2006)
New Revision: 55725
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/boehm-gc.c
trunk/mono/mono/metadata/gc.c
trunk/mono/mono/metadata/null-gc.c
Log:
2006-01-18 Robert Jordan <[EMAIL PROTECTED]>
* boehm-gc.c, null-gc.c (mono_gc_weak_link_remove):
Clear the weak link. Fixes bug #77170.
* gc.c (mono_gchandle_free):
Reflect *-gc.c changes (tiny optimization).
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-01-18 14:17:13 UTC (rev 55724)
+++ trunk/mono/mono/metadata/ChangeLog 2006-01-18 15:20:23 UTC (rev 55725)
@@ -1,3 +1,11 @@
+2006-01-18 Robert Jordan <[EMAIL PROTECTED]>
+
+ * boehm-gc.c, null-gc.c (mono_gc_weak_link_remove):
+ Clear the weak link. Fixes bug #77170.
+
+ * gc.c (mono_gchandle_free):
+ Reflect *-gc.c changes (tiny optimization).
+
2006-01-18 Zoltan Varga <[EMAIL PROTECTED]>
* metadata.c (mono_metadata_signature_dup): Applied patch from
Modified: trunk/mono/mono/metadata/boehm-gc.c
===================================================================
--- trunk/mono/mono/metadata/boehm-gc.c 2006-01-18 14:17:13 UTC (rev 55724)
+++ trunk/mono/mono/metadata/boehm-gc.c 2006-01-18 15:20:23 UTC (rev 55725)
@@ -132,6 +132,7 @@
mono_gc_weak_link_remove (void **link_addr)
{
GC_unregister_disappearing_link (link_addr);
+ *link_addr = NULL;
}
MonoObject*
Modified: trunk/mono/mono/metadata/gc.c
===================================================================
--- trunk/mono/mono/metadata/gc.c 2006-01-18 14:17:13 UTC (rev 55724)
+++ trunk/mono/mono/metadata/gc.c 2006-01-18 15:20:23 UTC (rev 55725)
@@ -665,7 +665,8 @@
if (slot < handles->size && (handles->bitmap [slot / 32] & (1 << (slot
% 32)))) {
if (handles->type <= HANDLE_WEAK_TRACK)
mono_gc_weak_link_remove (&handles->entries [slot]);
- handles->entries [slot] = NULL;
+ else
+ handles->entries [slot] = NULL;
handles->bitmap [slot / 32] &= ~(1 << (slot % 32));
} else {
/* print a warning? */
Modified: trunk/mono/mono/metadata/null-gc.c
===================================================================
--- trunk/mono/mono/metadata/null-gc.c 2006-01-18 14:17:13 UTC (rev 55724)
+++ trunk/mono/mono/metadata/null-gc.c 2006-01-18 15:20:23 UTC (rev 55725)
@@ -76,6 +76,7 @@
void
mono_gc_weak_link_remove (void **link_addr)
{
+ *link_addr = NULL;
}
MonoObject*
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches