Use the tls states cb function directly for non-imaging code

JuliaLang · Nov 22, 2015 · 2ecc7e5 · 2ecc7e5
1 parent ba275d0
commit 2ecc7e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -5641,7 +5641,7 @@ static void init_julia_llvm_env(Module *m)
                       AttributeSet::FunctionIndex, Attribute::ReadNone)
         .addAttribute(jltls_states_func->getContext(),
                       AttributeSet::FunctionIndex, Attribute::NoUnwind));
-    add_named_global(jltls_states_func, (void*)&jl_get_ptls_states);
+    add_named_global(jltls_states_func, (void*)jl_get_ptls_states_getter());
 #endif
 
     std::vector<Type*> args1(0);

diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -155,6 +155,7 @@ void jl_set_base_ctx(char *__stk);
 void jl_init_threading(void);
 void jl_start_threads(void);
 void jl_shutdown_threading(void);
+jl_get_ptls_states_func jl_get_ptls_states_getter(void);
 
 void jl_dump_bitcode(char *fname, const char *sysimg_data, size_t sysimg_len);
 void jl_dump_objfile(char *fname, int jit_model, const char *sysimg_data, size_t sysimg_len);

diff --git a/src/threading.c b/src/threading.c
@@ -59,6 +59,11 @@ DLLEXPORT void jl_set_ptls_states_getter(jl_get_ptls_states_func f)
         jl_tls_states_cb = f;
     }
 }
+jl_get_ptls_states_func jl_get_ptls_states_getter(void)
+{
+    // for codegen
+    return jl_tls_states_cb;
+}
 #else
 DLLEXPORT jl_tls_states_t jl_tls_states;
 DLLEXPORT JL_CONST_FUNC jl_tls_states_t *(jl_get_ptls_states)(void)