[llvm] r335950 - SCEVExpander::expandAddRecExprLiterally(): check before casting as Instruction
Roman Lebedev via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 29 00:44:20 PDT 2018
Author: lebedevri
Date: Fri Jun 29 00:44:20 2018
New Revision: 335950
URL: http://llvm.org/viewvc/llvm-project?rev=335950&view=rev
Log:
SCEVExpander::expandAddRecExprLiterally(): check before casting as Instruction
Summary:
An alternative to D48597.
Fixes [[ https://bugs.llvm.org/show_bug.cgi?id=37936 | PR37936 ]].
The problem is as follows:
1. `indvars` marks `%dec` as `NUW`.
2. `loop-instsimplify` runs `instsimplify`, which constant-folds `%dec` to -1 (D47908)
3. `loop-reduce` tries to do some further modification, but crashes
with an type assertion in cast, because `%dec` is no longer an `Instruction`,
If the runline is split into two, i.e. you first run `-indvars -loop-instsimplify`,
store that into a file, and then run `-loop-reduce`, there is no crash.
So it looks like the problem is due to `-loop-instsimplify` not discarding SCEV.
But in this case we can just not crash if it's not an `Instruction`.
This is just a local fix, unlike D48597, so there may very well be other problems.
Reviewers: mkazantsev, uabelho, sanjoy, silviu.baranga, wmi
Reviewed By: mkazantsev
Subscribers: evstupac, javed.absar, spatel, llvm-commits
Differential Revision: https://reviews.llvm.org/D48599
Added:
llvm/trunk/test/Transforms/LoopStrengthReduce/scev-after-loopinstsimplify.ll
Modified:
llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp
Modified: llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp?rev=335950&r1=335949&r2=335950&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp Fri Jun 29 00:44:20 2018
@@ -1169,8 +1169,11 @@ SCEVExpander::getAddRecExprPHILiterally(
if (!IsMatchingSCEV && !TryNonMatchingSCEV)
continue;
+ // TODO: this possibly can be reworked to avoid this cast at all.
Instruction *TempIncV =
- cast<Instruction>(PN.getIncomingValueForBlock(LatchBlock));
+ dyn_cast<Instruction>(PN.getIncomingValueForBlock(LatchBlock));
+ if (!TempIncV)
+ continue;
// Check whether we can reuse this PHI node.
if (LSRMode) {
Added: llvm/trunk/test/Transforms/LoopStrengthReduce/scev-after-loopinstsimplify.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/scev-after-loopinstsimplify.ll?rev=335950&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/LoopStrengthReduce/scev-after-loopinstsimplify.ll (added)
+++ llvm/trunk/test/Transforms/LoopStrengthReduce/scev-after-loopinstsimplify.ll Fri Jun 29 00:44:20 2018
@@ -0,0 +1,43 @@
+; RUN: opt %s -indvars -loop-instsimplify -loop-reduce
+; We are only checking that there is no crash!
+
+; https://bugs.llvm.org/show_bug.cgi?id=37936
+
+; The problem is as follows:
+; 1. indvars marks %dec as NUW.
+; 2. loop-instsimplify runs instsimplify, which constant-folds %dec to -1
+; 3. loop-reduce tries to do some further modification, but crashes
+; with an type assertion in cast, because %dec is no longer an Instruction,
+; even though the SCEV data indicated it was.
+
+; If the runline is split into two, i.e. -indvars -loop-instsimplify first, that
+; stored into a file, and then -loop-reduce is run on that, there is no crash.
+; So it looks like the problem is due to -loop-instsimplify not discarding SCEV.
+
+target datalayout = "n16"
+
+ at a = external global i16, align 1
+
+define void @f1() {
+entry:
+ br label %for.cond
+
+for.cond: ; preds = %land.end, %entry
+ %c.0 = phi i16 [ 0, %entry ], [ %dec, %land.end ]
+ br i1 undef, label %for.body, label %for.cond.cleanup
+
+for.cond.cleanup: ; preds = %for.cond
+ ret void
+
+for.body: ; preds = %for.cond
+ %0 = load i16, i16* @a, align 1
+ %cmp = icmp sgt i16 %0, %c.0
+ br i1 %cmp, label %land.rhs, label %land.end
+
+land.rhs: ; preds = %for.body
+ unreachable
+
+land.end: ; preds = %for.body
+ %dec = add nsw i16 %c.0, -1
+ br label %for.cond
+}
More information about the llvm-commits
mailing list