Merge pull request #18315 from JuliaLang/jn/tls-in_pure_context

make in_pure_callback state thread-local

src/alloc.c

@@ -472,10 +472,11 @@ static jl_lambda_info_t *jl_instantiate_staged(jl_method_t *generator, jl_tuplet
     jl_svec_t *sparam_vals = env;
     jl_lambda_info_t *func = generator->lambda_template;
     JL_GC_PUSH4(&ex, &linenum, &sparam_vals, &func);
-    int last_in = in_pure_callback;
+    jl_ptls_t ptls = jl_get_ptls_states();
+    int last_in = ptls->in_pure_callback;
     assert(jl_svec_len(func->sparam_syms) == jl_svec_len(sparam_vals));
     JL_TRY {
-        in_pure_callback = 1;
+        ptls->in_pure_callback = 1;
         ex = jl_exprn(lambda_sym, 2);
 
         int nargs = func->nargs;
@@ -525,10 +526,10 @@ static jl_lambda_info_t *jl_instantiate_staged(jl_method_t *generator, jl_tuplet
         for(i = 0, l = jl_array_len(stmts); i < l; i++) {
             jl_array_ptr_set(stmts, i, jl_resolve_globals(jl_array_ptr_ref(stmts, i), func));
         }
-        in_pure_callback = last_in;
+        ptls->in_pure_callback = last_in;
     }
     JL_CATCH {
-        in_pure_callback = last_in;
+        ptls->in_pure_callback = last_in;
         jl_rethrow();
     }
     JL_GC_POP();

src/ast.c

@@ -673,7 +673,7 @@ jl_value_t *jl_parse_eval_all(const char *fname,
                               const char *content, size_t contentlen)
 {
     jl_ptls_t ptls = jl_get_ptls_states();
-    if (in_pure_callback)
+    if (ptls->in_pure_callback)
         jl_error("cannot use include inside a generated function");
     jl_ast_context_t *ctx = jl_ast_ctx_enter();
     fl_context_t *fl_ctx = &ctx->fl;

src/builtins.c

@@ -582,7 +582,7 @@ jl_value_t *jl_toplevel_eval_in_warn(jl_module_t *m, jl_value_t *ex, int delay_w
             jl_printf(JL_STDERR, "\n  ** incremental compilation may be broken for these modules **\n\n");
         }
     }
-    if (in_pure_callback && !delay_warn)
+    if (ptls->in_pure_callback && !delay_warn)
         jl_error("eval cannot be used in a generated function");
     JL_TRY {
         jl_warn_on_eval = delay_warn && (jl_warn_on_eval || m != last_m); // compute whether a warning was suppressed

src/gf.c

@@ -31,11 +31,10 @@ JL_DLLEXPORT jl_value_t *jl_invoke(jl_lambda_info_t *meth, jl_value_t **args, ui
 
 /// ----- Handling for Julia callbacks ----- ///
 
-int in_pure_callback;
-
 JL_DLLEXPORT int8_t jl_is_in_pure_context(void)
 {
-    return in_pure_callback;
+    jl_ptls_t ptls = jl_get_ptls_states();
+    return ptls->in_pure_callback;
 }
 
 JL_DLLEXPORT void jl_trace_method(jl_method_t *m)
@@ -83,14 +82,14 @@ JL_DLLEXPORT void jl_register_linfo_tracer(void (*callback)(jl_lambda_info_t *tr
 void jl_call_tracer(tracer_cb callback, jl_value_t *tracee)
 {
     jl_ptls_t ptls = jl_get_ptls_states();
-    int last_in = in_pure_callback;
+    int last_in = ptls->in_pure_callback;
     JL_TRY {
-        in_pure_callback = 1;
+        ptls->in_pure_callback = 1;
         callback(tracee);
-        in_pure_callback = last_in;
+        ptls->in_pure_callback = last_in;
     }
     JL_CATCH {
-        in_pure_callback = last_in;
+        ptls->in_pure_callback = last_in;
         jl_printf(JL_STDERR, "WARNING: tracer callback function threw an error:\n");
         jl_static_show(JL_STDERR, ptls->exception_in_transit);
         jl_printf(JL_STDERR, "\n");

src/julia_internal.h

@@ -40,10 +40,6 @@ extern "C" {
 // useful constants
 extern jl_methtable_t *jl_type_type_mt;
 
-// execution of certain certain unpure
-// statements is prohibited from certain
-// callbacks (such as generated functions)
-extern int in_pure_callback;
 typedef void (*tracer_cb)(jl_value_t *tracee);
 void jl_call_tracer(tracer_cb callback, jl_value_t *tracee);
 

src/julia_threads.h

@@ -107,6 +107,11 @@ typedef struct _jl_tls_states_t {
     pthread_t system_id;
     void *signal_stack;
 #endif
+    // execution of certain certain impure
+    // statements is prohibited from certain
+    // callbacks (such as generated functions)
+    // as it may make compilation undecidable
+    int in_pure_callback;
     // Counter to disable finalizer **on the current thread**
     int finalizers_inhibited;
     arraylist_t finalizers;

src/task.c

@@ -400,8 +400,8 @@ JL_DLLEXPORT jl_value_t *jl_switchto(jl_task_t *t, jl_value_t *arg)
     }
     if (ptls->in_finalizer)
         jl_error("task switch not allowed from inside gc finalizer");
-    if (in_pure_callback)
-        jl_error("task switch not allowed from inside staged function");
+    if (ptls->in_pure_callback)
+        jl_error("task switch not allowed from inside staged nor pure functions");
     sig_atomic_t defer_signal = ptls->defer_signal;
     int8_t gc_state = jl_gc_unsafe_enter(ptls);
     ptls->task_arg_in_transit = arg;