1 files changed, 7 insertions, 89 deletions

diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index c4b45ed1473..92fd56a52af 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -73,7 +73,6 @@ STATISTIC(NumBitMaps, "Number of switch instructions turned into bitmaps");
 STATISTIC(NumLinearMaps, "Number of switch instructions turned into linear mapping");
 STATISTIC(NumLookupTables, "Number of switch instructions turned into lookup tables");
 STATISTIC(NumLookupTablesHoles, "Number of switch instructions turned into lookup tables (holes checked)");
-STATISTIC(NumTableCmpReuses, "Number of reused switch table lookup compares");
 STATISTIC(NumSinkCommons, "Number of common instructions sunk down to the end block");
 STATISTIC(NumSpeculations, "Number of speculative executed instructions");
 
@@ -3983,78 +3982,6 @@ static bool ShouldBuildLookupTable(SwitchInst *SI,
   return SI->getNumCases() * 10 >= TableSize * 4;
 }
 
-/// Try to reuse the switch table index compare. Following pattern:
-/// \code
-///     if (idx < tablesize)
-///        r = table[idx]; // table does not contain default_value
-///     else
-///        r = default_value;
-///     if (r != default_value)
-///        ...
-/// \endcode
-/// Is optimized to:
-/// \code
-///     cond = idx < tablesize;
-///     if (cond)
-///        r = table[idx];
-///     else
-///        r = default_value;
-///     if (cond)
-///        ...
-/// \endcode
-/// Jump threading will then eliminate the second if(cond).
-static void reuseTableCompare(User *PhiUser, BasicBlock *PhiBlock,
-          BranchInst *RangeCheckBranch, Constant *DefaultValue,
-          const SmallVectorImpl<std::pair<ConstantInt*, Constant*> >& Values) {
-
-  ICmpInst *CmpInst = dyn_cast<ICmpInst>(PhiUser);
-  if (!CmpInst)
-    return;
-
-  // We require that the compare is in the same block as the phi so that jump
-  // threading can do its work afterwards.
-  if (CmpInst->getParent() != PhiBlock)
-    return;
-
-  Constant *CmpOp1 = dyn_cast<Constant>(CmpInst->getOperand(1));
-  if (!CmpOp1)
-    return;
-
-  Value *RangeCmp = RangeCheckBranch->getCondition();
-  Constant *TrueConst = ConstantInt::getTrue(RangeCmp->getType());
-  Constant *FalseConst = ConstantInt::getFalse(RangeCmp->getType());
-
-  // Check if the compare with the default value is constant true or false.
-  Constant *DefaultConst = ConstantExpr::getICmp(CmpInst->getPredicate(),
-                                                 DefaultValue, CmpOp1, true);
-  if (DefaultConst != TrueConst && DefaultConst != FalseConst)
-    return;
-
-  // Check if the compare with the case values is distinct from the default
-  // compare result.
-  for (auto ValuePair : Values) {
-    Constant *CaseConst = ConstantExpr::getICmp(CmpInst->getPredicate(),
-                              ValuePair.second, CmpOp1, true);
-    if (!CaseConst || CaseConst == DefaultConst)
-      return;
-    assert((CaseConst == TrueConst || CaseConst == FalseConst) &&
-           "Expect true or false as compare result.");
-  }
-
-  if (DefaultConst == FalseConst) {
-    // The compare yields the same result. We can replace it.
-    CmpInst->replaceAllUsesWith(RangeCmp);
-    ++NumTableCmpReuses;
-  } else {
-    // The compare yields the same result, just inverted. We can replace it.
-    Value *InvertedTableCmp = BinaryOperator::CreateXor(RangeCmp,
-                ConstantInt::get(RangeCmp->getType(), 1), "inverted.cmp",
-                RangeCheckBranch);
-    CmpInst->replaceAllUsesWith(InvertedTableCmp);
-    ++NumTableCmpReuses;
-  }
-}
-
 /// SwitchToLookupTable - If the switch is only used to initialize one or more
 /// phi nodes in a common successor block with different constant values,
 /// replace the switch with lookup tables.
@@ -4131,8 +4058,11 @@ static bool SwitchToLookupTable(SwitchInst *SI,
   // If the table has holes, we need a constant result for the default case
   // or a bitmask that fits in a register.
   SmallVector<std::pair<PHINode*, Constant*>, 4> DefaultResultsList;
-  bool HasDefaultResults = GetCaseResults(SI, nullptr, SI->getDefaultDest(),
+  bool HasDefaultResults = false;
+  if (TableHasHoles) {
+    HasDefaultResults = GetCaseResults(SI, nullptr, SI->getDefaultDest(),
                                        &CommonDest, DefaultResultsList, DL);
+  }
 
   bool NeedMask = (TableHasHoles && !HasDefaultResults);
   if (NeedMask) {
@@ -4176,8 +4106,6 @@ static bool SwitchToLookupTable(SwitchInst *SI,
   // lookup table BB. Otherwise, check if the condition value is within the case
   // range. If it is so, branch to the new BB. Otherwise branch to SI's default
   // destination.
-  BranchInst *RangeCheckBranch = nullptr;
-
   const bool GeneratingCoveredLookupTable = MaxTableSize == TableSize;
   if (GeneratingCoveredLookupTable) {
     Builder.CreateBr(LookupBB);
@@ -4188,7 +4116,7 @@ static bool SwitchToLookupTable(SwitchInst *SI,
   } else {
     Value *Cmp = Builder.CreateICmpULT(TableIndex, ConstantInt::get(
                                        MinCaseVal->getType(), TableSize));
-    RangeCheckBranch = Builder.CreateCondBr(Cmp, LookupBB, SI->getDefaultDest());
+    Builder.CreateCondBr(Cmp, LookupBB, SI->getDefaultDest());
   }
 
   // Populate the BB that does the lookups.
@@ -4239,11 +4167,11 @@ static bool SwitchToLookupTable(SwitchInst *SI,
   bool ReturnedEarly = false;
   for (size_t I = 0, E = PHIs.size(); I != E; ++I) {
     PHINode *PHI = PHIs[I];
-    const ResultListTy &ResultList = ResultLists[PHI];
 
     // If using a bitmask, use any value to fill the lookup table holes.
     Constant *DV = NeedMask ? ResultLists[PHI][0].second : DefaultResults[PHI];
-    SwitchLookupTable Table(Mod, TableSize, MinCaseVal, ResultList, DV, DL);
+    SwitchLookupTable Table(Mod, TableSize, MinCaseVal, ResultLists[PHI],
+                            DV, DL);
 
     Value *Result = Table.BuildLookup(TableIndex, Builder);
 
@@ -4256,16 +4184,6 @@ static bool SwitchToLookupTable(SwitchInst *SI,
       break;
     }
 
-    // Do a small peephole optimization: re-use the switch table compare if
-    // possible.
-    if (!TableHasHoles && HasDefaultResults && RangeCheckBranch) {
-      BasicBlock *PhiBlock = PHI->getParent();
-      // Search for compare instructions which use the phi.
-      for (auto *User : PHI->users()) {
-        reuseTableCompare(User, PhiBlock, RangeCheckBranch, DV, ResultList);
-      }
-    }
-
     PHI->addIncoming(Result, LookupBB);
   }