fix #27933, don't eval value of global vars in cluster deserializer

JuliaLang · Jul 6, 2018 · d556784 · d556784
1 parent 6eed2fa
commit d556784
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/stdlib/Distributed/src/clusterserialize.jl b/stdlib/Distributed/src/clusterserialize.jl
@@ -173,10 +173,11 @@ function deserialize_global_from_main(s::ClusterSerializer, sym)
     sym_isconst = deserialize(s)
     v = deserialize(s)
     if sym_isconst
-        @eval Main const $sym = $v
+        ccall(:jl_set_const, Cvoid, (Any, Any, Any), Main, sym, v)
     else
-        @eval Main $sym = $v
+        ccall(:jl_set_global, Cvoid, (Any, Any, Any), Main, sym, v)
     end
+    return nothing
 end
 
 function delete_global_tracker(s::ClusterSerializer, v)

diff --git a/stdlib/Distributed/test/distributed_exec.jl b/stdlib/Distributed/test/distributed_exec.jl
@@ -1501,6 +1501,10 @@ else
     @info "SO_REUSEPORT is unsupported, skipping reuseport tests"
 end
 
+# issue #27933
+a27933 = :_not_defined_27933
+@test remotecall_fetch(()->a27933, first(workers())) === a27933
+
 # Run topology tests last after removing all workers, since a given
 # cluster at any time only supports a single topology.
 rmprocs(workers())