Skip to content

Commit 9ba821d

Browse files
committed
clang/OpenCL: Fix assertion on call to function with addrspace argument
Don't know how anything was working before. There must have been a recent regression, but I haven't looked yet.
1 parent 0428f2c commit 9ba821d

File tree

2 files changed

+70
-1
lines changed

2 files changed

+70
-1
lines changed

clang/lib/CodeGen/CGCall.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5394,7 +5394,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
53945394
// can happen due to trivial type mismatches.
53955395
if (FirstIRArg < IRFuncTy->getNumParams() &&
53965396
V->getType() != IRFuncTy->getParamType(FirstIRArg))
5397-
V = Builder.CreateBitCast(V, IRFuncTy->getParamType(FirstIRArg));
5397+
V = Builder.CreateAddrSpaceCast(V,
5398+
IRFuncTy->getParamType(FirstIRArg));
53985399

53995400
if (ArgHasMaybeUndefAttr)
54005401
V = Builder.CreateFreeze(V);
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
2+
// RUN: %clang_cc1 -cl-std=CL2.0 -triple amdgcn-amd-amdhsa -disable-llvm-passes -emit-llvm -o - %s | FileCheck %s
3+
4+
// Check there's no assertion when passing a pointer to an address space
5+
// qualified argument.
6+
7+
extern void private_ptr(__private int *);
8+
extern void local_ptr(__local int *);
9+
extern void generic_ptr(__generic int *);
10+
11+
// CHECK-LABEL: define dso_local void @use_of_private_var(
12+
// CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
13+
// CHECK-NEXT: [[ENTRY:.*:]]
14+
// CHECK-NEXT: [[X:%.*]] = alloca i32, align 4, addrspace(5)
15+
// CHECK-NEXT: [[X_ASCAST:%.*]] = addrspacecast ptr addrspace(5) [[X]] to ptr
16+
// CHECK-NEXT: call void @llvm.lifetime.start.p5(i64 4, ptr addrspace(5) [[X]]) #[[ATTR4:[0-9]+]]
17+
// CHECK-NEXT: store i32 0, ptr [[X_ASCAST]], align 4, !tbaa [[TBAA4:![0-9]+]]
18+
// CHECK-NEXT: [[TMP0:%.*]] = addrspacecast ptr [[X_ASCAST]] to ptr addrspace(5)
19+
// CHECK-NEXT: call void @private_ptr(ptr addrspace(5) noundef [[TMP0]]) #[[ATTR5:[0-9]+]]
20+
// CHECK-NEXT: call void @generic_ptr(ptr noundef [[X_ASCAST]]) #[[ATTR5]]
21+
// CHECK-NEXT: call void @llvm.lifetime.end.p5(i64 4, ptr addrspace(5) [[X]]) #[[ATTR4]]
22+
// CHECK-NEXT: ret void
23+
//
24+
void use_of_private_var()
25+
{
26+
int x = 0 ;
27+
private_ptr(&x);
28+
generic_ptr(&x);
29+
}
30+
31+
// CHECK-LABEL: define dso_local void @addr_of_arg(
32+
// CHECK-SAME: i32 noundef [[X:%.*]]) #[[ATTR0]] {
33+
// CHECK-NEXT: [[ENTRY:.*:]]
34+
// CHECK-NEXT: [[X_ADDR:%.*]] = alloca i32, align 4, addrspace(5)
35+
// CHECK-NEXT: [[X_ADDR_ASCAST:%.*]] = addrspacecast ptr addrspace(5) [[X_ADDR]] to ptr
36+
// CHECK-NEXT: store i32 [[X]], ptr [[X_ADDR_ASCAST]], align 4, !tbaa [[TBAA4]]
37+
// CHECK-NEXT: [[TMP0:%.*]] = addrspacecast ptr [[X_ADDR_ASCAST]] to ptr addrspace(5)
38+
// CHECK-NEXT: call void @private_ptr(ptr addrspace(5) noundef [[TMP0]]) #[[ATTR5]]
39+
// CHECK-NEXT: call void @generic_ptr(ptr noundef [[X_ADDR_ASCAST]]) #[[ATTR5]]
40+
// CHECK-NEXT: ret void
41+
//
42+
void addr_of_arg(int x)
43+
{
44+
private_ptr(&x);
45+
generic_ptr(&x);
46+
}
47+
48+
// CHECK-LABEL: define dso_local amdgpu_kernel void @use_of_local_var(
49+
// CHECK-SAME: ) #[[ATTR3:[0-9]+]] !kernel_arg_addr_space [[META8:![0-9]+]] !kernel_arg_access_qual [[META8]] !kernel_arg_type [[META8]] !kernel_arg_base_type [[META8]] !kernel_arg_type_qual [[META8]] {
50+
// CHECK-NEXT: [[ENTRY:.*:]]
51+
// CHECK-NEXT: call void @local_ptr(ptr addrspace(3) noundef @use_of_local_var.x) #[[ATTR5]]
52+
// CHECK-NEXT: call void @generic_ptr(ptr noundef addrspacecast (ptr addrspace(3) @use_of_local_var.x to ptr)) #[[ATTR5]]
53+
// CHECK-NEXT: ret void
54+
//
55+
__kernel void use_of_local_var()
56+
{
57+
__local int x;
58+
local_ptr(&x);
59+
generic_ptr(&x);
60+
}
61+
62+
//.
63+
// CHECK: [[TBAA4]] = !{[[META5:![0-9]+]], [[META5]], i64 0}
64+
// CHECK: [[META5]] = !{!"int", [[META6:![0-9]+]], i64 0}
65+
// CHECK: [[META6]] = !{!"omnipotent char", [[META7:![0-9]+]], i64 0}
66+
// CHECK: [[META7]] = !{!"Simple C/C++ TBAA"}
67+
// CHECK: [[META8]] = !{}
68+
//.

0 commit comments

Comments
 (0)