Skip to content

Commit a87e23c

Browse files
committed
PHITransAddr: Avoid looking at constant use lists
Avoids asserts in GVN
1 parent fea5554 commit a87e23c

File tree

2 files changed

+79
-7
lines changed

2 files changed

+79
-7
lines changed

llvm/lib/Analysis/PHITransAddr.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ Value *PHITransAddr::translateSubExpr(Value *V, BasicBlock *CurBB,
224224

225225
// Scan to see if we have this GEP available.
226226
Value *APHIOp = GEPOps[0];
227+
if (isa<ConstantData>(APHIOp))
228+
return nullptr;
229+
227230
for (User *U : APHIOp->users()) {
228231
if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(U))
229232
if (GEPI->getType() == GEP->getType() &&

llvm/test/Transforms/GVN/pr65447.ll

+76-7
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,98 @@
22
; RUN: opt -S -passes=gvn < %s | FileCheck %s
33

44
; Make sure deduplicated phi nodes are removed from the VN map.
5-
define i64 @f() {
6-
; CHECK-LABEL: define i64 @f() {
5+
define i64 @f2(ptr %arg) {
6+
; CHECK-LABEL: define i64 @f2(
7+
; CHECK-SAME: ptr [[ARG:%.*]]) {
8+
; CHECK-NEXT: BB:
9+
; CHECK-NEXT: store i1 false, ptr [[ARG]], align 1
10+
; CHECK-NEXT: br label [[BB2D:%.*]]
11+
; CHECK: BB2a:
12+
; CHECK-NEXT: br label [[BB2B:%.*]]
13+
; CHECK: BB2b:
14+
; CHECK-NEXT: br label [[BB2C:%.*]]
15+
; CHECK: BB2c:
16+
; CHECK-NEXT: [[AZ2:%.*]] = phi i1 [ true, [[BB2B]] ], [ [[AZ:%.*]], [[BB2D]] ]
17+
; CHECK-NEXT: [[DOTPHI_TRANS_INSERT:%.*]] = sext i1 [[AZ2]] to i64
18+
; CHECK-NEXT: [[GEP2_PHI_TRANS_INSERT:%.*]] = getelementptr i1, ptr [[ARG]], i64 [[DOTPHI_TRANS_INSERT]]
19+
; CHECK-NEXT: [[L93_PRE:%.*]] = load i1, ptr [[GEP2_PHI_TRANS_INSERT]], align 1
20+
; CHECK-NEXT: br label [[BB2D]]
21+
; CHECK: BB2d:
22+
; CHECK-NEXT: [[AZ]] = phi i1 [ [[AZ2]], [[BB2C]] ], [ false, [[BB:%.*]] ]
23+
; CHECK-NEXT: [[L93:%.*]] = phi i1 [ [[L93_PRE]], [[BB2C]] ], [ false, [[BB]] ]
24+
; CHECK-NEXT: [[TMP0:%.*]] = sext i1 [[AZ]] to i64
25+
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr i1, ptr [[ARG]], i64 [[TMP0]]
26+
; CHECK-NEXT: store i1 [[AZ]], ptr [[ARG]], align 2
27+
; CHECK-NEXT: br i1 [[L93]], label [[BB2C]], label [[BB1E:%.*]]
28+
; CHECK: BB1e:
29+
; CHECK-NEXT: br i1 [[AZ]], label [[BB2F:%.*]], label [[BB4:%.*]]
30+
; CHECK: BB2f:
31+
; CHECK-NEXT: store i1 true, ptr [[ARG]], align 2
32+
; CHECK-NEXT: br label [[BB2B]]
33+
; CHECK: BB4:
34+
; CHECK-NEXT: br label [[BB4]]
35+
;
36+
BB:
37+
store i1 false, ptr %arg, align 1
38+
br label %BB2d
39+
40+
BB2a: ; No predecessors!
41+
br label %BB2b
42+
43+
BB2b: ; preds = %BB2f, %BB2a
44+
br label %BB2c
45+
46+
BB2c: ; preds = %BB2d, %BB2b
47+
%0 = phi i1 [ true, %BB2b ], [ %1, %BB2d ]
48+
br label %BB2d
49+
50+
BB2d: ; preds = %BB2c, %BB
51+
%1 = phi i1 [ %0, %BB2c ], [ false, %BB ]
52+
%2 = sext i1 %1 to i64
53+
%gep2 = getelementptr i1, ptr %arg, i64 %2
54+
%L93 = load i1, ptr %gep2, align 1
55+
%Az = load i1, ptr %arg, align 2
56+
store i1 %1, ptr %arg, align 2
57+
br i1 %L93, label %BB2c, label %BB1e
58+
59+
BB1e: ; preds = %BB2d
60+
br i1 %Az, label %BB2f, label %BB4
61+
62+
BB2f: ; preds = %BB1e
63+
store i1 true, ptr %arg, align 2
64+
br label %BB2b
65+
66+
BB4: ; preds = %BB1e, %BB4
67+
br label %BB4
68+
69+
; uselistorder directives
70+
uselistorder label %BB4, { 1, 0 }
71+
}
72+
73+
; Make sure deduplicated phi nodes are removed from the VN map. Make
74+
; sure there is no assert on attempt to use ConstantData use lists.
75+
define i64 @f_null() {
76+
; CHECK-LABEL: define i64 @f_null() {
777
; CHECK-NEXT: BB:
878
; CHECK-NEXT: store i1 false, ptr null, align 1
979
; CHECK-NEXT: br label [[BB2D:%.*]]
1080
; CHECK: BB2a:
1181
; CHECK-NEXT: br label [[BB2B:%.*]]
1282
; CHECK: BB2b:
13-
; CHECK-NEXT: [[L93_PRE_PRE:%.*]] = load i1, ptr inttoptr (i64 -1 to ptr), align 1
1483
; CHECK-NEXT: br label [[BB2C:%.*]]
1584
; CHECK: BB2c:
16-
; CHECK-NEXT: [[L93_PRE:%.*]] = phi i1 [ [[L93_PRE_PRE]], [[BB2B]] ], [ true, [[BB2D]] ]
1785
; CHECK-NEXT: [[AZ2:%.*]] = phi i1 [ true, [[BB2B]] ], [ [[AZ:%.*]], [[BB2D]] ]
1886
; CHECK-NEXT: [[DOTPHI_TRANS_INSERT:%.*]] = sext i1 [[AZ2]] to i64
1987
; CHECK-NEXT: [[GEP2_PHI_TRANS_INSERT:%.*]] = getelementptr i1, ptr null, i64 [[DOTPHI_TRANS_INSERT]]
88+
; CHECK-NEXT: [[L93_PRE:%.*]] = load i1, ptr [[GEP2_PHI_TRANS_INSERT]], align 1
2089
; CHECK-NEXT: br label [[BB2D]]
2190
; CHECK: BB2d:
22-
; CHECK-NEXT: [[L93_PRE5:%.*]] = phi i1 [ [[L93_PRE]], [[BB2C]] ], [ false, [[BB:%.*]] ]
23-
; CHECK-NEXT: [[AZ]] = phi i1 [ [[AZ2]], [[BB2C]] ], [ false, [[BB]] ]
91+
; CHECK-NEXT: [[AZ]] = phi i1 [ [[AZ2]], [[BB2C]] ], [ false, [[BB:%.*]] ]
92+
; CHECK-NEXT: [[L93:%.*]] = phi i1 [ [[L93_PRE]], [[BB2C]] ], [ false, [[BB]] ]
2493
; CHECK-NEXT: [[TMP0:%.*]] = sext i1 [[AZ]] to i64
2594
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr i1, ptr null, i64 [[TMP0]]
2695
; CHECK-NEXT: store i1 [[AZ]], ptr null, align 2
27-
; CHECK-NEXT: br i1 [[L93_PRE5]], label [[BB2C]], label [[BB1E:%.*]]
96+
; CHECK-NEXT: br i1 [[L93]], label [[BB2C]], label [[BB1E:%.*]]
2897
; CHECK: BB1e:
2998
; CHECK-NEXT: br i1 [[AZ]], label [[BB2F:%.*]], label [[BB4:%.*]]
3099
; CHECK: BB2f:

0 commit comments

Comments
 (0)