Don't use thread pinning in Boehm

jechter · jechter · commit 59db324d74a8 · 2019-01-24T08:30:25.000+01:00
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
@@ -562,7 +562,7 @@ create_internal_thread_object (void)
 
 	thread->apartment_state = ThreadApartmentState_Unknown;
 	thread->managed_id = get_next_managed_thread_id ();
-	if (mono_gc_is_moving ()) {
+	if (mono_gc_is_moving () && !HAVE_BOEHM_GC) {
 		thread->thread_pinning_ref = thread;
 		MONO_GC_REGISTER_ROOT_PINNING (thread->thread_pinning_ref, MONO_ROOT_SOURCE_THREADING, NULL, "Thread Pinning Reference");
 	}
@@ -884,7 +884,7 @@ mono_thread_detach_internal (MonoInternalThread *thread)
 
 	mono_memory_barrier ();
 
-	if (mono_gc_is_moving ()) {
+	if (mono_gc_is_moving () && !HAVE_BOEHM_GC) {
 		MONO_GC_UNREGISTER_ROOT (thread->thread_pinning_ref);
 		thread->thread_pinning_ref = NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ create_internal_thread_object (void)`
`562`	`562`
`563`	`563`	`thread->apartment_state = ThreadApartmentState_Unknown;`
`564`	`564`	`thread->managed_id = get_next_managed_thread_id ();`
`565`		`- if (mono_gc_is_moving ()) {`
	`565`	`+ if (mono_gc_is_moving () && !HAVE_BOEHM_GC) {`
`566`	`566`	`thread->thread_pinning_ref = thread;`
`567`	`567`	`MONO_GC_REGISTER_ROOT_PINNING (thread->thread_pinning_ref, MONO_ROOT_SOURCE_THREADING, NULL, "Thread Pinning Reference");`
`568`	`568`	`}`
`@@ -884,7 +884,7 @@ mono_thread_detach_internal (MonoInternalThread *thread)`
`884`	`884`
`885`	`885`	`mono_memory_barrier ();`
`886`	`886`
`887`		`- if (mono_gc_is_moving ()) {`
	`887`	`+ if (mono_gc_is_moving () && !HAVE_BOEHM_GC) {`
`888`	`888`	`MONO_GC_UNREGISTER_ROOT (thread->thread_pinning_ref);`
`889`	`889`	`thread->thread_pinning_ref = NULL;`
`890`	`890`	`}`