From 90f29bcd90d19e6b840ee09120fa3116903d2a63 Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Tue, 31 Aug 2010 20:58:44 +0000
Subject: [PATCH] Revert r112432. It appears to be exposing a problem in the
emacs build.
llvm-svn: 112638
---
llvm/lib/Analysis/ScalarEvolution.cpp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index 121c6e2a3270..863f8a65409c 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
@@ -3332,16 +3332,11 @@ const SCEV *ScalarEvolution::createSCEV(Value *V) {
// LLVM IR canonical form means we need only traverse the left operands.
SmallVector<const SCEV *, 4> AddOps;
AddOps.push_back(getSCEV(U->getOperand(1)));
- for (Value *Op = U->getOperand(0); ; Op = U->getOperand(0)) {
- unsigned Opcode = Op->getValueID() - Value::InstructionVal;
- if (Opcode != Instruction::Add && Opcode != Instruction::Sub)
- break;
+ for (Value *Op = U->getOperand(0);
+ Op->getValueID() == Instruction::Add + Value::InstructionVal;
+ Op = U->getOperand(0)) {
U = cast<Operator>(Op);
- const SCEV *Op1 = getSCEV(U->getOperand(1));
- if (Opcode == Instruction::Sub)
- AddOps.push_back(getNegativeSCEV(Op1));
- else
- AddOps.push_back(Op1);
+ AddOps.push_back(getSCEV(U->getOperand(1)));
}
AddOps.push_back(getSCEV(U->getOperand(0)));
return getAddExpr(AddOps);