Skip to content
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

Jump to bottom

Fixes for bitcast bugs with LLVM 17 / opaque pointers #54548

Merged
merged 3 commits into from
May 22, 2024
Merged

Fixes for bitcast bugs with LLVM 17 / opaque pointers #54548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3686743
bitcast: skip setName on folded inputs
maleadt May 22, 2024
2f9e739
bitcast: ensure the target pointer address space is used.
maleadt May 22, 2024
4776607
Add test.
maleadt May 22, 2024
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
14 changes: 13 additions & 1 deletion src/intrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,21 @@ static jl_cgval_t generic_bitcast(jl_codectx_t &ctx, ArrayRef<jl_cgval_t> argv)
if (isa<Instruction>(vx) && !vx->hasName())
// emit_inttoptr may undo an PtrToInt
setName(ctx.emission_context, vx, "bitcast_coercion");
} else if (vxt->isPointerTy() && llvmt->isPointerTy()) {
// emit_bitcast preserves the origin address space, which we can't have here
#if JL_LLVM_VERSION >= 170000
vx = ctx.builder.CreateAddrSpaceCast(vx, llvmt);
#else
vx = ctx.builder.CreatePointerBitCastOrAddrSpaceCast(vx, llvmt);
#endif
if (isa<Instruction>(vx) && !vx->hasName())
// cast may have been folded
setName(ctx.emission_context, vx, "bitcast_coercion");
} else {
vx = emit_bitcast(ctx, vx, llvmt);
setName(ctx.emission_context, vx, "bitcast_coercion");
if (isa<Instruction>(vx) && !vx->hasName())
// emit_bitcast may undo another bitcast
setName(ctx.emission_context, vx, "bitcast_coercion");
}
}

Expand Down
13 changes: 13 additions & 0 deletions test/intrinsics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,16 @@ Base.show(io::IO, a::IntWrap) = print(io, "IntWrap(", a.x, ")")
@test r2 isa IntWrap && r2.x === 103 === r[].x && r2 !== r[]
end
end)()

@testset "issue #54548" begin
@inline passthrough(ptr::Core.LLVMPtr{T,A}) where {T,A} = Base.llvmcall(("""
define ptr addrspace(1) @entry(ptr addrspace(1) %0) #0 {
entry:
ret ptr addrspace(1) %0
}

attributes #0 = { alwaysinline }""", "entry"),
Core.LLVMPtr{T,A}, Tuple{Core.LLVMPtr{T,A}}, ptr)
f(gws) = passthrough(Core.bitcast(Core.LLVMPtr{UInt32,1}, gws))
f(C_NULL)
end