Skip to content

Commit 970cc46

Browse files
committed
fixup! fixup! move gc_safe to cconv field
1 parent 394b60b commit 970cc46

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/src/devdocs/llvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ need to make sure that the array does stay alive while we're doing the
347347
[`ccall`](@ref). To understand how this is done, lets look at a hypothetical
348348
approximate possible lowering of the above code:
349349
```julia
350-
return $(Expr(:foreigncall, :(:foo), Cvoid, svec(Ptr{Float64}), 0, false, :(:ccall), Expr(:foreigncall, :(:jl_array_ptr), Ptr{Float64}, svec(Any), 0, false, :(:ccall), :(A)), :(A)))
350+
return $(Expr(:foreigncall, :(:foo), Cvoid, svec(Ptr{Float64}), 0, :(:ccall), Expr(:foreigncall, :(:jl_array_ptr), Ptr{Float64}, svec(Any), 0, :(:ccall), :(A)), :(A)))
351351
```
352352
The last `:(A)`, is an extra argument list inserted during lowering that informs
353353
the code generator which Julia level values need to be kept alive for the

src/ccall.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ const int fc_args_start = 6;
14191419
// Expr(:foreigncall, pointer, rettype, (argtypes...), nreq, gc_safe, [cconv | (cconv, effects)], args..., roots...)
14201420
static jl_cgval_t emit_ccall(jl_codectx_t &ctx, jl_value_t **args, size_t nargs)
14211421
{
1422-
JL_NARGSV(ccall, 6);
1422+
JL_NARGSV(ccall, 5);
14231423
args -= 1;
14241424
jl_value_t *rt = args[2];
14251425
jl_value_t *at = args[3];

0 commit comments

Comments
 (0)