From bca59d2a4334013e5fc04e7d01e57e0c9e00e026 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Mon, 2 May 2016 19:43:22 +0000
Subject: Revert "[SimplifyCFG] Extend TryToSimplifyUncondBranchFromEmptyBlock
 for empty block including lifetime intrinsics"

This reverts commit r268254.

This change causes assertion failures while building Chromium. Reduced
test case coming soon.

llvm-svn: 268288
---
 llvm/lib/IR/BasicBlock.cpp | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'llvm/lib/IR/BasicBlock.cpp')

diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp
index 604ea3aa0b9..9f806fad680 100644
--- a/llvm/lib/IR/BasicBlock.cpp
+++ b/llvm/lib/IR/BasicBlock.cpp
@@ -206,30 +206,6 @@ Instruction* BasicBlock::getFirstNonPHIOrDbgOrLifetime() {
   return nullptr;
 }
 
-Instruction *BasicBlock::getFirstNonPHIOrDbgOrLifetimeOrBitCast() {
-  for (Instruction &I : *this) {
-    if (isa<PHINode>(I) || isa<DbgInfoIntrinsic>(I))
-      continue;
-
-    if (auto *II = dyn_cast<IntrinsicInst>(&I))
-      if (II->getIntrinsicID() == Intrinsic::lifetime_start ||
-          II->getIntrinsicID() == Intrinsic::lifetime_end)
-        continue;
-
-    if (auto *BCI = dyn_cast<BitCastInst>(&I)) {
-      if (auto *II = dyn_cast<IntrinsicInst>(++I.getIterator())) {
-        if ((II->getIntrinsicID() == Intrinsic::lifetime_start ||
-             II->getIntrinsicID() == Intrinsic::lifetime_end) &&
-            II->getOperand(1) == BCI) {
-          continue;
-        }
-      }
-    }
-    return &I;
-  }
-  return nullptr;
-}
-
 BasicBlock::iterator BasicBlock::getFirstInsertionPt() {
   Instruction *FirstNonPHI = getFirstNonPHI();
   if (!FirstNonPHI)
-- 
cgit v1.2.3