Permalink
Browse files

[sgen] Remove SCAN_OBJECT_ACTION - dead code.

  • Loading branch information...
schani committed Feb 27, 2013
1 parent de4d1ef commit 872cff99fd8866b2da9b0dc1b04c31c3135384fc
Showing with 0 additions and 22 deletions.
  1. +0 −4 mono/metadata/sgen-debug.c
  2. +0 −18 mono/metadata/sgen-scan-object.h
@@ -172,7 +172,6 @@ check_consistency_callback (char *start, size_t size, void *dummy)
GCVTable *vt = (GCVTable*)LOAD_VTABLE (start);
SGEN_LOG (8, "Scanning object %p, vtable: %p (%s)", start, vt, vt->klass->name);
-#define SCAN_OBJECT_ACTION
#include "sgen-scan-object.h"
}
@@ -211,7 +210,6 @@ sgen_check_consistency (void)
static void
check_major_refs_callback (char *start, size_t size, void *dummy)
{
-#define SCAN_OBJECT_ACTION
#include "sgen-scan-object.h"
}
@@ -369,7 +367,6 @@ verify_object_pointers_callback (char *start, size_t size, void *data)
{
gboolean allow_missing_pinned = (gboolean)data;
-#define SCAN_OBJECT_ACTION
#include "sgen-scan-object.h"
}
@@ -501,7 +498,6 @@ check_marked_callback (char *start, size_t size, void *dummy)
return;
}
-#define SCAN_OBJECT_ACTION
#include "sgen-scan-object.h"
}
@@ -30,12 +30,6 @@
* SCAN_OBJECT_NOSCAN - if defined, don't actually scan the object,
* i.e. don't invoke the OBJ_XXX macros.
*
- * SCAN_OBJECT_ACTION - is invoked after an object has been scanned.
- * The object's start is "start", its length in bytes (including
- * padding at the end) is "skip_size". "desc" is the object's GC
- * descriptor. The action can use the macro
- * "SCAN" to scan the object.
- *
* SCAN_OBJECT_NOVTABLE - desc is provided by the includer, instead of
* vt. Complex arrays cannot not be scanned.
*
@@ -44,10 +38,6 @@
* collection, not for debugging scans.
*/
-#ifndef SCAN_OBJECT_ACTION
-#define SCAN_OBJECT_ACTION
-#endif
-
{
#ifndef SCAN_OBJECT_NOVTABLE
GCVTable *vt;
@@ -73,31 +63,27 @@
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
case DESC_TYPE_SMALL_BITMAP:
#define SCAN OBJ_BITMAP_FOREACH_PTR (desc, start)
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
case DESC_TYPE_VECTOR:
#define SCAN OBJ_VECTOR_FOREACH_PTR (desc, start)
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
case DESC_TYPE_LARGE_BITMAP:
#define SCAN OBJ_LARGE_BITMAP_FOREACH_PTR (desc, start)
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
case DESC_TYPE_COMPLEX:
@@ -106,7 +92,6 @@
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
#ifndef SCAN_OBJECT_NOVTABLE
@@ -116,20 +101,17 @@
#ifndef SCAN_OBJECT_NOSCAN
SCAN;
#endif
- SCAN_OBJECT_ACTION;
#undef SCAN
break;
#endif
case DESC_TYPE_COMPLEX_PTRFREE:
/*Nothing to do*/
- SCAN_OBJECT_ACTION;
break;
default:
g_assert_not_reached ();
}
}
#undef SCAN_OBJECT_NOSCAN
-#undef SCAN_OBJECT_ACTION
#undef SCAN_OBJECT_NOVTABLE
#undef SCAN_OBJECT_PROTOCOL

0 comments on commit 872cff9

Please sign in to comment.