[sgen] Fix binary protocol build

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 2ea2bf033f5df12f021c9107e887f44bd36de4f4..fb4c5aba3b41621f045f7d7bf8526141744ca97c 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -1237,7 +1237,7 @@ conservatively_pin_objects_from (void **start, void **end, void *start_nursery,
                        if (addr >= (mword)start_nursery && addr < (mword)end_nursery) {
                                SGEN_LOG (6, "Pinning address %p from %p", (void*)addr, start);
                                sgen_pin_stage_ptr ((void*)addr);
-                               binary_protocol_pin_stage (start, (void*)addr, thread_info);
+                               binary_protocol_pin_stage (start, (void*)addr);
                                count++;
                        }
                        if (G_UNLIKELY (do_pin_stats)) { 

diff --git a/mono/metadata/sgen-protocol.c b/mono/metadata/sgen-protocol.c
index 7e6d16ded78514cfddb8b462d5907171706a19a5..1663905d1a4ee1c60002b6e34387ef187457e20b 100644 (file)
--- a/mono/metadata/sgen-protocol.c
+++ b/mono/metadata/sgen-protocol.c
@@ -439,9 +439,9 @@ binary_protocol_copy (gpointer from, gpointer to, gpointer vtable, int size)
 }
 
 void
-binary_protocol_pin_stage (gpointer addr_ptr, gpointer addr, gpointer thread)
+binary_protocol_pin_stage (gpointer addr_ptr, gpointer addr)
 {
-       SGenProtocolPinStage entry = { addr_ptr, addr, thread };
+       SGenProtocolPinStage entry = { addr_ptr, addr };
        protocol_entry (SGEN_PROTOCOL_PIN_STAGE, &entry, sizeof (SGenProtocolPinStage));
 }
 

diff --git a/mono/metadata/sgen-protocol.h b/mono/metadata/sgen-protocol.h
index 1b4b24a3d54d85587dc5fb3129af2d7d85449073..234f54f5b612fed289d8e0750dccb6f4e9887164 100644 (file)
--- a/mono/metadata/sgen-protocol.h
+++ b/mono/metadata/sgen-protocol.h
@@ -116,7 +116,6 @@ typedef struct {
 typedef struct {
        gpointer addr_ptr;
        gpointer addr;
-       gpointer thread;
 } SGenProtocolPinStage;
 
 typedef struct {
@@ -279,7 +278,7 @@ void binary_protocol_alloc (gpointer obj, gpointer vtable, int size) MONO_INTERN
 void binary_protocol_alloc_pinned (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_alloc_degraded (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_copy (gpointer from, gpointer to, gpointer vtable, int size) MONO_INTERNAL;
-void binary_protocol_pin_stage (gpointer addr_ptr, gpointer addr, gpointer thread) MONO_INTERNAL;
+void binary_protocol_pin_stage (gpointer addr_ptr, gpointer addr) MONO_INTERNAL;
 void binary_protocol_pin (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_mark (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
 void binary_protocol_scan_begin (gpointer obj, gpointer vtable, int size) MONO_INTERNAL;
@@ -304,7 +303,7 @@ void binary_protocol_gray_dequeue (gpointer queue, gpointer cursor, gpointer val
 #define binary_protocol_alloc_pinned(obj, vtable, size)
 #define binary_protocol_alloc_degraded(obj, vtable, size)
 #define binary_protocol_copy(from, to, vtable, size)
-#define binary_protocol_pin_stage(addr_ptr, addr, thread)
+#define binary_protocol_pin_stage(addr_ptr, addr)
 #define binary_protocol_pin(obj, vtable, size)
 #define binary_protocol_mark(obj, vtable, size)
 #define binary_protocol_scan_begin(obj, vtable, size)

diff --git a/tools/sgen/sgen-grep-binprot.c b/tools/sgen/sgen-grep-binprot.c
index e881fd02f9e38b40ea7a1a4fc422a057e9dacbd1..757773156889314f0fd41e281c6c21b77804db39 100644 (file)
--- a/tools/sgen/sgen-grep-binprot.c
+++ b/tools/sgen/sgen-grep-binprot.c
@@ -180,7 +180,7 @@ print_entry (int type, void *data)
        }
        case SGEN_PROTOCOL_PIN_STAGE: {
                SGenProtocolPinStage *entry = data;
-               printf ("pin stage addr ptr %p addr %p thread %p\n", entry->addr_ptr, entry->addr, entry->thread);
+               printf ("pin stage addr ptr %p addr %p\n", entry->addr_ptr, entry->addr);
                break;
        }
        case SGEN_PROTOCOL_PIN: {
@@ -339,7 +339,7 @@ is_match (gpointer ptr, int type, void *data)
        }
        case SGEN_PROTOCOL_PIN_STAGE: {
                SGenProtocolPinStage *entry = data;
-               return ptr == entry->addr_ptr || ptr == entry->addr || ptr == entry->thread;
+               return ptr == entry->addr_ptr || ptr == entry->addr;
        }
        case SGEN_PROTOCOL_PIN: {
                SGenProtocolPin *entry = data;