Update ccalls in info_cachefile to Julia upstream changes
#31
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- JuliaLang/julia#52123: Added the `int ignore_native` argument to jl_restore_package_image_from_file - JuliaLang/julia#49538: Added the `const char *pkgname` argument to jl_restore_package_image_from_file and jl_restore_incremental.
fatteneder
commented
May 12, 2024
| @@ -182,9 +182,19 @@ end | |||
|
|
|||
| function info_cachefile(pkg::PkgId, path::String, depmods::Vector{Any}, isocache::Bool=false) | |||
| if isocache | |||
| sv = ccall(:jl_restore_package_image_from_file, Any, (Cstring, Any, Cint), path, depmods, true) | |||
| @static if VERSION >= v"1.11.0-DEV.922" # https://github.com/JuliaLang/julia/pull/52123 | |||
| sv = ccall(:jl_restore_package_image_from_file, Any, (Cstring, Any, Cint, Cstring, Cint), path, depmods, true, pkg.name, false) | |||
There was a problem hiding this comment.
@IanButterworth Is using ignore_native = false for the last argument correct?
|
Merged into branch |
|
Ah wait, this aspect of my changes got undone, so we could use the same changes on 1.12. I'll add them and credit you. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following PRs have added extra arguments to two C methods that are used by
info_cachefile, which this PR fixes.int ignore_nativeargument to jl_restore_package_image_from_fileLOAD_Pkgimagezone JuliaLang/julia#49538: Added theconst char *pkgnameargument to jl_restore_package_image_from_file and jl_restore_incremental.