[sgen] Optional check that the concurrent collector doesn't update references.

[mono.git] / mono / metadata / sgen-cardtable.c

diff --git a/mono/metadata/sgen-cardtable.c b/mono/metadata/sgen-cardtable.c
index 7ee7e07bee31616d3ee43a3e3cc6324be5e41acf..10524efe7b03dcf400a7c0c9c60e278d8da2b8df 100644 (file)
--- a/mono/metadata/sgen-cardtable.c
+++ b/mono/metadata/sgen-cardtable.c
@@ -113,7 +113,7 @@ sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int
 
                for (; dest >= start; --src, --dest) {
                        gpointer value = *src;
-                       *dest = value;
+                       SGEN_UPDATE_REFERENCE_ALLOW_NULL (dest, value);
                        if (need_mod_union || sgen_ptr_in_nursery (value))
                                sgen_card_table_mark_address ((mword)dest);
                        sgen_dummy_use (value);
@@ -122,7 +122,7 @@ sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int
                gpointer *end = dest + count;
                for (; dest < end; ++src, ++dest) {
                        gpointer value = *src;
-                       *dest = value;
+                       SGEN_UPDATE_REFERENCE_ALLOW_NULL (dest, value);
                        if (need_mod_union || sgen_ptr_in_nursery (value))
                                sgen_card_table_mark_address ((mword)dest);
                        sgen_dummy_use (value);
@@ -479,22 +479,6 @@ mono_gc_card_table_nursery_check (void)
 }
 
 #if 0
-static void
-collect_faulted_cards (void)
-{
-#define CARD_PAGES (CARD_COUNT_IN_BYTES / 4096)
-       int i, count = 0;
-       unsigned char faulted [CARD_PAGES] = { 0 };
-       mincore (sgen_cardtable, CARD_COUNT_IN_BYTES, faulted);
-
-       for (i = 0; i < CARD_PAGES; ++i) {
-               if (faulted [i])
-                       ++count;
-       }
-
-       printf ("TOTAL card pages %d faulted %d\n", CARD_PAGES, count);
-}
-
 void
 sgen_card_table_dump_obj_card (char *object, size_t size, void *dummy)
 {