Skip to content

Commit 22e1df7

Browse files
authored
[LLVM][OpenMPOpt] Fix a crash when associated function is nullptr (llvm#66274)
The associated function can be a nullptr if it is an indirect call. This causes a crash in `CheckCallee` which always assumes the callee is a valid pointer. Fix llvm#66904.
1 parent e16474b commit 22e1df7

File tree

2 files changed

+44
-1
lines changed

2 files changed

+44
-1
lines changed

llvm/lib/Transforms/IPO/OpenMPOpt.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5028,7 +5028,8 @@ struct AAKernelInfoCallSite : AAKernelInfo {
50285028
const auto *AACE =
50295029
A.getAAFor<AACallEdges>(*this, getIRPosition(), DepClassTy::OPTIONAL);
50305030
if (!AACE || !AACE->getState().isValidState() || AACE->hasUnknownCallee()) {
5031-
CheckCallee(getAssociatedFunction(), /*NumCallees=*/1);
5031+
if (Function *F = getAssociatedFunction())
5032+
CheckCallee(F, /*NumCallees=*/1);
50325033
} else {
50335034
const auto &OptimisticEdges = AACE->getOptimisticEdges();
50345035
for (auto *Callee : OptimisticEdges) {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
; RUN: opt -S -passes=openmp-opt < %s
2+
target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-p7:160:256:256:32-p8:128:128-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-G1-ni:7:8"
3+
target triple = "amdgcn-amd-amdhsa"
4+
5+
%"struct.ompx::state::TeamStateTy" = type { %"struct.ompx::state::ICVStateTy", i32, i32, ptr }
6+
%"struct.ompx::state::ICVStateTy" = type { i32, i32, i32, i32, i32, i32, i32 }
7+
8+
@_ZN4ompx5state9TeamStateE = internal addrspace(3) global %"struct.ompx::state::TeamStateTy" undef
9+
10+
define amdgpu_kernel void @__omp_offloading_32_70c2e76c_main_l24() {
11+
%1 = tail call i32 @__kmpc_target_init(ptr null)
12+
call void @__kmpc_parallel_51(ptr null, i32 0, i32 0, i32 0, i32 0, ptr @__omp_offloading_32_70c2e76c_main_l24_omp_outlined, ptr null, ptr null, i64 0)
13+
ret void
14+
}
15+
16+
define void @__omp_offloading_32_70c2e76c_main_l24_omp_outlined(ptr %0) {
17+
call void @__kmpc_for_static_init_4()
18+
br label %2
19+
20+
2: ; preds = %2, %1
21+
%3 = load ptr, ptr addrspace(1) null, align 4294967296
22+
%4 = call i32 %3(i32 0)
23+
store i32 %4, ptr %0, align 4
24+
br label %2
25+
}
26+
27+
define internal i32 @__kmpc_target_init(ptr %0) {
28+
store i32 0, ptr addrspace(3) @_ZN4ompx5state9TeamStateE, align 16
29+
ret i32 0
30+
}
31+
32+
declare void @__kmpc_parallel_51(ptr, i32, i32, i32, i32, ptr, ptr, ptr, i64)
33+
34+
define void @__kmpc_for_static_init_4() {
35+
%1 = load i32, ptr addrspace(3) @_ZN4ompx5state9TeamStateE, align 8
36+
ret void
37+
}
38+
39+
!llvm.module.flags = !{!0, !1}
40+
41+
!0 = !{i32 7, !"openmp", i32 51}
42+
!1 = !{i32 7, !"openmp-device", i32 51}

0 commit comments

Comments
 (0)