Skip to content

Fix assume effects handling for gc_safe #59557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2025
Merged

Fix assume effects handling for gc_safe #59557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bde44d
Fix assume effects handling for gc_safe
gbaraldi Sep 15, 2025
3e469cb
Fix typo
gbaraldi Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base/c.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,6 @@ macro ccall(exprs...)
return ccall_macro_lower((:ccall), ccall_macro_parse(exprs)...)
end

macro ccall_effects(effects::UInt16, expr)
return ccall_macro_lower((:ccall, effects), ccall_macro_parse(expr)...)
macro ccall_effects(effects::UInt16, exprs...)
return ccall_macro_lower((:ccall, effects), ccall_macro_parse(exprs)...)
end
3 changes: 2 additions & 1 deletion test/ccall.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,14 +1970,15 @@ end

function gc_safe_ccall()
# jl_rand is marked as JL_NOTSAFEPOINT
@ccall gc_safe=true jl_rand()::UInt64
Base.@assume_effects :nothrow @ccall gc_safe=true jl_rand()::UInt64
end

let llvm = sprint(code_llvm, gc_safe_ccall, ())
# check that the call works
@test gc_safe_ccall() isa UInt64
# check for the gc_safe store
@test occursin("store atomic i8 2", llvm)
@test Base.infer_effects(gc_safe_ccall, Tuple{}).nothrow == true
end

@testset "jl_dlfind and dlsym" begin
Expand Down