Don't confuse canonicalize and lookup. Fixes predsimplify.reg4.ll. Also

corrects missing optimization opportunity removing cases from a switch.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30009 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 20 insertions, 21 deletions

diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp
index 7f998dac3f..ba28040ed1 100644
--- a/lib/Transforms/Scalar/PredicateSimplifier.cpp
+++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp
@@ -576,30 +576,29 @@ void PredicateSimplifier::visit(BranchInst *BI,
 void PredicateSimplifier::visit(SwitchInst *SI,
                              DominatorTree::Node *DTNode, PropertySet KP) {
   Value *Condition = SI->getCondition();
+  DEBUG(assert(Condition == KP.canonicalize(Condition) &&
+               "Instruction wasn't already canonicalized?"));
 
   // If there's an NEProperty covering this SwitchInst, we may be able to
   // eliminate one of the cases.
-  if (Value *C = KP.lookup(Condition)) {
-    Condition = C;
-    for (PropertySet::ConstPropertyIterator I = KP.Properties.begin(),
-         E = KP.Properties.end(); I != E; ++I) {
-      if (I->Opcode != PropertySet::NE) continue;
-      Value *V1 = KP.lookup(I->V1),
-            *V2 = KP.lookup(I->V2);
-      if (V1 != C && V2 != C) continue;
-
-      // Is one side a number?
-      ConstantInt *CI = dyn_cast<ConstantInt>(KP.lookup(I->V1));
-      if (!CI)     CI = dyn_cast<ConstantInt>(KP.lookup(I->V2));
-
-      if (CI) {
-        unsigned i = SI->findCaseValue(CI);
-        if (i != 0) {
-          SI->getSuccessor(i)->removePredecessor(SI->getParent());
-          SI->removeCase(i);
-          modified = true;
-          ++NumSwitchCases;
-        }
+  for (PropertySet::ConstPropertyIterator I = KP.Properties.begin(),
+       E = KP.Properties.end(); I != E; ++I) {
+    if (I->Opcode != PropertySet::NE) continue;
+    Value *V1 = KP.canonicalize(I->V1),
+          *V2 = KP.canonicalize(I->V2);
+    if (V1 != Condition && V2 != Condition) continue;
+
+    // Is one side a number?
+    ConstantInt *CI = dyn_cast<ConstantInt>(KP.canonicalize(I->V1));
+    if (!CI)     CI = dyn_cast<ConstantInt>(KP.canonicalize(I->V2));
+
+    if (CI) {
+      unsigned i = SI->findCaseValue(CI);
+      if (i != 0) {
+        SI->getSuccessor(i)->removePredecessor(SI->getParent());
+        SI->removeCase(i);
+        modified = true;
+        ++NumSwitchCases;
       }
     }
   }