Skip to content

Commit 7276352

Browse files
committed
[LSR] Clear SCEVExpander before calling DeleteDeadPHIs
To avoid an assertion failure when an AssertingVH is removed, as reported in: #82362 (comment) Also remove an unnecessary use of SCEVExpanderCleaner.
1 parent 3ed4b95 commit 7276352

File tree

2 files changed

+44
-3
lines changed

2 files changed

+44
-3
lines changed

llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7033,7 +7033,6 @@ static bool ReduceLoopStrength(Loop *L, IVUsers &IU, ScalarEvolution &SE,
70337033
// SCEVExpander for both use in preheader and latch
70347034
const DataLayout &DL = L->getHeader()->getModule()->getDataLayout();
70357035
SCEVExpander Expander(SE, DL, "lsr_fold_term_cond");
7036-
SCEVExpanderCleaner ExpCleaner(Expander);
70377036

70387037
assert(Expander.isSafeToExpand(TermValueS) &&
70397038
"Terminating value was checked safe in canFoldTerminatingCondition");
@@ -7064,10 +7063,9 @@ static bool ReduceLoopStrength(Loop *L, IVUsers &IU, ScalarEvolution &SE,
70647063

70657064
BI->setCondition(NewTermCond);
70667065

7066+
Expander.clear();
70677067
OldTermCond->eraseFromParent();
70687068
DeleteDeadPHIs(L->getHeader(), &TLI, MSSAU.get());
7069-
7070-
ExpCleaner.markResultUsed();
70717069
}
70727070
}
70737071

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
2+
; RUN: opt -S -passes=loop-reduce -mtriple=riscv64-unknown-linux-gnu < %s | FileCheck %s
3+
4+
define void @test(ptr %p, i8 %arg, i32 %start) {
5+
; CHECK-LABEL: define void @test(
6+
; CHECK-SAME: ptr [[P:%.*]], i8 [[ARG:%.*]], i32 [[START:%.*]]) {
7+
; CHECK-NEXT: entry:
8+
; CHECK-NEXT: [[CONV:%.*]] = zext i8 [[ARG]] to i32
9+
; CHECK-NEXT: [[SHR:%.*]] = lshr i32 [[CONV]], 1
10+
; CHECK-NEXT: [[TMP0:%.*]] = add i32 [[START]], [[SHR]]
11+
; CHECK-NEXT: [[TMP1:%.*]] = add i32 [[TMP0]], 1
12+
; CHECK-NEXT: br label [[FOR_BODY:%.*]]
13+
; CHECK: for.body:
14+
; CHECK-NEXT: [[ADD810:%.*]] = phi i32 [ [[START]], [[ENTRY:%.*]] ], [ [[ADD:%.*]], [[FOR_BODY]] ]
15+
; CHECK-NEXT: [[IDXPROM2:%.*]] = zext i32 [[ADD810]] to i64
16+
; CHECK-NEXT: [[ARRAYIDX3:%.*]] = getelementptr i8, ptr [[P]], i64 [[IDXPROM2]]
17+
; CHECK-NEXT: [[V:%.*]] = load i8, ptr [[ARRAYIDX3]], align 1
18+
; CHECK-NEXT: [[ADD]] = add i32 [[ADD810]], 1
19+
; CHECK-NEXT: [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND:%.*]] = icmp eq i32 [[ADD]], [[TMP1]]
20+
; CHECK-NEXT: br i1 [[LSR_FOLD_TERM_COND_REPLACED_TERM_COND]], label [[EXIT:%.*]], label [[FOR_BODY]]
21+
; CHECK: exit:
22+
; CHECK-NEXT: ret void
23+
;
24+
entry:
25+
%conv = zext i8 %arg to i32
26+
%shr = lshr i32 %conv, 1
27+
%wide.trip.count = zext nneg i32 %shr to i64
28+
br label %for.body
29+
30+
for.body:
31+
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
32+
%add810 = phi i32 [ %start, %entry ], [ %add, %for.body ]
33+
%idxprom2 = zext i32 %add810 to i64
34+
%arrayidx3 = getelementptr i8, ptr %p, i64 %idxprom2
35+
%v = load i8, ptr %arrayidx3, align 1
36+
%add = add i32 %add810, 1
37+
%indvars.iv.next = add i64 %indvars.iv, 1
38+
%exitcond.not = icmp eq i64 %indvars.iv, %wide.trip.count
39+
br i1 %exitcond.not, label %exit, label %for.body
40+
41+
exit:
42+
ret void
43+
}

0 commit comments

Comments
 (0)