Merge pull request #29325 from JuliaLang/vc/restored

check return from jl_restore_incremental correctly
JuliaLang · Sep 30, 2018 · 4d06e00 · 4d06e00 · nanosoldier · Sep 30, 2018
2 parents f7f87c2 + f474f75
commit 4d06e00
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -615,6 +615,9 @@ end
 # and it reconnects the Base.Docs.META
 function _include_from_serialized(path::String, depmods::Vector{Any})
     sv = ccall(:jl_restore_incremental, Any, (Cstring, Any), path, depmods)
+    if isa(sv, Exception)
+        return sv
+    end
     restored = sv[1]
     if !isa(restored, Exception)
         for M in restored::Vector{Any}