From: Evan Cheng <evan.cheng@apple.com>
Date: Fri, 18 Sep 2009 08:26:06 +0000 (+0000)
Subject: Revert r82214. It broke 403.gcc on x86_64 / Darwin.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8be58a11868ae081c195c107cd39a07f1f523877;p=oota-llvm.git

Revert r82214. It broke 403.gcc on x86_64 / Darwin.

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

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index e2fab1b1b80..19ea6473115 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -982,7 +982,6 @@ SelectionDAGISel::FinishBasicBlock() {
   
   // If we generated any switch lowering information, build and codegen any
   // additional DAGs necessary.
-  SmallSet<unsigned, 4> Processed;
   for (unsigned i = 0, e = SDL->SwitchCases.size(); i != e; ++i) {
     // Set the current basic block to the mbb we wish to insert the code into
     BB = SDL->SwitchCases[i].ThisBB;
@@ -1005,18 +1004,12 @@ SelectionDAGISel::FinishBasicBlock() {
         for (unsigned pn = 0; ; ++pn) {
           assert(pn != SDL->PHINodesToUpdate.size() &&
                  "Didn't find PHI entry!");
-          if (SDL->PHINodesToUpdate[pn].first != Phi)
-            continue;
-          if (!Processed.insert(pn))
-            // Already processed, done. We can't have the value from more than
-            // one edges.
+          if (SDL->PHINodesToUpdate[pn].first == Phi) {
+            Phi->addOperand(MachineOperand::CreateReg(SDL->PHINodesToUpdate[pn].
+                                                      second, false));
+            Phi->addOperand(MachineOperand::CreateMBB(SDL->SwitchCases[i].ThisBB));
             break;
-          Phi->addOperand(MachineOperand::CreateReg(SDL->PHINodesToUpdate[pn].
-                                                    second, false));
-          assert(BB->isPred(SDL->SwitchCases[i].ThisBB) &&
-                 "phi value cannot come from a bb that is not a predecessor!");
-          Phi->addOperand(MachineOperand::CreateMBB(SDL->SwitchCases[i].ThisBB));
-          break;
+          }
         }
       }