Skip to content

Commit 736d56e

Browse files
KristofferCRAI CI (GitHub Action Automation)
authored andcommitted
Revert "loading: fix ccall signature in _include_from_serialized (JuliaLang#57776)"
This reverts commit be5bc79.
1 parent 0c646a7 commit 736d56e

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

base/loading.jl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,21 +1267,17 @@ function _include_from_serialized(pkg::PkgId, path::String, ocachepath::Union{No
12671267
sv = try
12681268
if ocachepath !== nothing
12691269
@debug "Loading object cache file $ocachepath for $(repr("text/plain", pkg))"
1270-
ccall(:jl_restore_package_image_from_file, Any, (Cstring, Any, Cint, Cstring, Cint),
1270+
ccall(:jl_restore_package_image_from_file, Ref{SimpleVector}, (Cstring, Any, Cint, Cstring, Cint),
12711271
ocachepath, depmods, #=completeinfo=#false, pkg.name, ignore_native)
12721272
else
12731273
@debug "Loading cache file $path for $(repr("text/plain", pkg))"
1274-
ccall(:jl_restore_incremental, Any, (Cstring, Any, Cint, Cstring),
1274+
ccall(:jl_restore_incremental, Ref{SimpleVector}, (Cstring, Any, Cint, Cstring),
12751275
path, depmods, #=completeinfo=#false, pkg.name)
12761276
end
12771277
finally
12781278
lock(require_lock)
12791279
end
1280-
if isa(sv, Exception)
1281-
return sv
1282-
end
12831280

1284-
sv = sv::SimpleVector
12851281
edges = sv[3]::Vector{Any}
12861282
ext_edges = sv[4]::Union{Nothing,Vector{Any}}
12871283
extext_methods = sv[5]::Vector{Any}

0 commit comments

Comments
 (0)