diff options
| author | Dan Gohman <gohman@apple.com> | 2009-04-16 16:15:25 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-04-16 16:15:25 +0000 |
| commit | 313404c34fe8a65cb879545c4633e15bf6ddec5e (patch) | |
| tree | 7c5e745f798a41a1aa365171882200aaf5a8aa51 | |
| parent | 0e96a4f81306c88f6a759b8535368be6bbd1f577 (diff) | |
| download | external_llvm-313404c34fe8a65cb879545c4633e15bf6ddec5e.zip external_llvm-313404c34fe8a65cb879545c4633e15bf6ddec5e.tar.gz external_llvm-313404c34fe8a65cb879545c4633e15bf6ddec5e.tar.bz2 | |
Fix SCEVExpander::visitSMaxExpr and SCEVExpander::visitUMaxExpr to
not create ICmpInsts with operands of different types. This fixes
a regression in Applications/d/make_dparser.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@69294 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Analysis/ScalarEvolutionExpander.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/Analysis/ScalarEvolutionExpander.cpp b/lib/Analysis/ScalarEvolutionExpander.cpp index 0033fb4..6300f1f 100644 --- a/lib/Analysis/ScalarEvolutionExpander.cpp +++ b/lib/Analysis/ScalarEvolutionExpander.cpp @@ -295,9 +295,13 @@ Value *SCEVExpander::visitSignExtendExpr(SCEVSignExtendExpr *S) { } Value *SCEVExpander::visitSMaxExpr(SCEVSMaxExpr *S) { + const Type *Ty = S->getType(); Value *LHS = expand(S->getOperand(0)); + LHS = InsertCastOfTo(CastInst::getCastOpcode(LHS, false, Ty, false), LHS, Ty); for (unsigned i = 1; i < S->getNumOperands(); ++i) { Value *RHS = expand(S->getOperand(i)); + RHS = InsertCastOfTo(CastInst::getCastOpcode(RHS, false, Ty, false), + RHS, Ty); Value *ICmp = new ICmpInst(ICmpInst::ICMP_SGT, LHS, RHS, "tmp", InsertPt); LHS = SelectInst::Create(ICmp, LHS, RHS, "smax", InsertPt); } @@ -305,9 +309,13 @@ Value *SCEVExpander::visitSMaxExpr(SCEVSMaxExpr *S) { } Value *SCEVExpander::visitUMaxExpr(SCEVUMaxExpr *S) { + const Type *Ty = S->getType(); Value *LHS = expand(S->getOperand(0)); + LHS = InsertCastOfTo(CastInst::getCastOpcode(LHS, false, Ty, false), LHS, Ty); for (unsigned i = 1; i < S->getNumOperands(); ++i) { Value *RHS = expand(S->getOperand(i)); + RHS = InsertCastOfTo(CastInst::getCastOpcode(RHS, false, Ty, false), + RHS, Ty); Value *ICmp = new ICmpInst(ICmpInst::ICMP_UGT, LHS, RHS, "tmp", InsertPt); LHS = SelectInst::Create(ICmp, LHS, RHS, "umax", InsertPt); } |