[mono/mono] 930e8fe9: [sgen] Set the TLS key offsets in one place in create_allocator ().

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/6633bf16973e...930e8fe970cd

   Commit: 930e8fe970cd5b58977f5ad00c2379c6267c8aac
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-10-18 17:28:39 GMT
      URL: https://github.com/mono/mono/commit/930e8fe970cd5b58977f5ad00c2379c6267c8aac

[sgen] Set the TLS key offsets in one place in create_allocator ().

Changed paths:
  M mono/metadata/sgen-alloc.c

Modified: mono/metadata/sgen-alloc.c
===================================================================
@@ -704,6 +704,9 @@ enum {
 	MONO_THREAD_VAR_OFFSET (tlab_next_addr, tlab_next_addr_offset);
 	MONO_THREAD_VAR_OFFSET (tlab_temp_end, tlab_temp_end_offset);
 
+	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_NEXT_ADDR, tlab_next_addr_offset);
+	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_TEMP_END, tlab_temp_end_offset);
+
 	g_assert (tlab_next_addr_offset != -1);
 	g_assert (tlab_temp_end_offset != -1);
 #endif
@@ -985,9 +988,6 @@ enum {
 
 	if (tlab_next_offset == -1 || tlab_temp_end_offset == -1)
 		return NULL;
-
-	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_NEXT_ADDR, tlab_next_offset);
-	mono_tls_key_set_offset (TLS_KEY_SGEN_TLAB_TEMP_END, tlab_temp_end_offset);
 #endif
 	if (collect_before_allocs)
 		return NULL;


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches