[llvm] r235511 - Fix a type mismatch assert in SCEV division
Brendon Cahoon
bcahoon at codeaurora.org
Wed Apr 22 08:06:40 PDT 2015
Author: bcahoon
Date: Wed Apr 22 10:06:40 2015
New Revision: 235511
URL: http://llvm.org/viewvc/llvm-project?rev=235511&view=rev
Log:
Fix a type mismatch assert in SCEV division
An assert was triggered when attempting to create a new SCEV
with operands of different types in the visitAddRecExpr. In this
test case, the operand types of the numerator and denominator
are different. The SCEV division code should generate a
conservative answer when this happens.
Differential Revision: http://reviews.llvm.org/D9021
Added:
llvm/trunk/test/Analysis/Delinearization/type_mismatch.ll
Modified:
llvm/trunk/lib/Analysis/ScalarEvolution.cpp
Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=235511&r1=235510&r2=235511&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Wed Apr 22 10:06:40 2015
@@ -795,6 +795,14 @@ public:
assert(Numerator->isAffine() && "Numerator should be affine");
divide(SE, Numerator->getStart(), Denominator, &StartQ, &StartR);
divide(SE, Numerator->getStepRecurrence(SE), Denominator, &StepQ, &StepR);
+ // Bail out if the types do not match.
+ Type *Ty = Denominator->getType();
+ if (Ty != StartQ->getType() || Ty != StartR->getType() ||
+ Ty != StepQ->getType() || Ty != StepR->getType()) {
+ Quotient = Zero;
+ Remainder = Numerator;
+ return;
+ }
Quotient = SE.getAddRecExpr(StartQ, StepQ, Numerator->getLoop(),
Numerator->getNoWrapFlags());
Remainder = SE.getAddRecExpr(StartR, StepR, Numerator->getLoop(),
Added: llvm/trunk/test/Analysis/Delinearization/type_mismatch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/Delinearization/type_mismatch.ll?rev=235511&view=auto
==============================================================================
--- llvm/trunk/test/Analysis/Delinearization/type_mismatch.ll (added)
+++ llvm/trunk/test/Analysis/Delinearization/type_mismatch.ll Wed Apr 22 10:06:40 2015
@@ -0,0 +1,29 @@
+; RUN: opt < %s -analyze -delinearize
+; REQUIRES: asserts
+
+; Test that SCEV divide code doesn't crash when attempting to create a SCEV
+; with operands of different types. In this case, the visitAddRecExpr
+; function tries to create an AddRec where the start and step are different
+; types.
+
+target datalayout = "e-m:e-p:32:32-i64:64-a:0-v32:32-n16:32"
+
+define fastcc void @test() {
+entry:
+ %0 = load i16, i16* undef, align 2
+ %conv21 = zext i16 %0 to i32
+ br label %for.cond7.preheader
+
+for.cond7.preheader:
+ %p1.022 = phi i8* [ undef, %entry ], [ %add.ptr, %for.end ]
+ br label %for.body11
+
+for.body11:
+ %arrayidx.phi = phi i8* [ %p1.022, %for.cond7.preheader ], [ undef, %for.body11 ]
+ store i8 undef, i8* %arrayidx.phi, align 1
+ br i1 undef, label %for.body11, label %for.end
+
+for.end:
+ %add.ptr = getelementptr inbounds i8, i8* %p1.022, i32 %conv21
+ br label %for.cond7.preheader
+}
More information about the llvm-commits
mailing list