X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fsgen-stw.c;h=b6fe446cc36d28b5e8d4ca3341b342b5158007a2;hb=30305335b8295bfb9426e95443ad2e32784c154f;hp=12111cbc32dd66949192143a28b0c9935f37abbb;hpb=a0173a7e76ad48889ade46116e516731b170e7c5;p=mono.git

diff --git a/mono/metadata/sgen-stw.c b/mono/metadata/sgen-stw.c
index 12111cbc32d..b6fe446cc36 100755
--- a/mono/metadata/sgen-stw.c
+++ b/mono/metadata/sgen-stw.c
@@ -200,13 +200,13 @@ sgen_stop_world (int generation)
 {
 	int count, dead;
 
-	/*XXX this is the right stop, thought might not be the nicest place to put it*/
-	sgen_process_togglerefs ();
-
 	mono_profiler_gc_event (MONO_GC_EVENT_PRE_STOP_WORLD, generation);
 	MONO_GC_WORLD_STOP_BEGIN ();
 	acquire_gc_locks ();
 
+	/* We start to scan after locks are taking, this ensures we won't be interrupted. */
+	sgen_process_togglerefs ();
+
 	update_current_thread_stack (&count);
 
 	sgen_global_stop_count++;