From 428c14d1dbab6a968b034880f496b59f659bddc2 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 7 Feb 2019 06:21:28 +0000 Subject: [PATCH] [BranchFolding] Remove dead code for handling EHPad blocks Summary: This code tries to handle the case where IBB is an EHPad, but there's an earlier check that uses PBB->hasEHPadSuccessor(). Where PBB is a predecessor of IBB. The hasEHPadSuccessor function would have visited IBB and seen that it was an EHPad and returned false. This would prevent us from reaching this code with IBB as an EHPad. Looks like this code was originally added in rL37427 (ancient) and made dead in rL143001. Reviewers: rnk, void, efriedma Reviewed By: rnk Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D57358 llvm-svn: 353375 --- llvm/lib/CodeGen/BranchFolding.cpp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index cfe969ced8e7..95b0ddec63b8 100644 --- a/llvm/lib/CodeGen/BranchFolding.cpp +++ b/llvm/lib/CodeGen/BranchFolding.cpp @@ -1182,29 +1182,6 @@ bool BranchFolder::TailMergeBlocks(MachineFunction &MF) { } } - // Failing case: the only way IBB can be reached from PBB is via - // exception handling. Happens for landing pads. Would be nice to have - // a bit in the edge so we didn't have to do all this. - if (IBB->isEHPad()) { - MachineFunction::iterator IP = ++PBB->getIterator(); - MachineBasicBlock *PredNextBB = nullptr; - if (IP != MF.end()) - PredNextBB = &*IP; - if (!TBB) { - if (IBB != PredNextBB) // fallthrough - continue; - } else if (FBB) { - if (TBB != IBB && FBB != IBB) // cbr then ubr - continue; - } else if (Cond.empty()) { - if (TBB != IBB) // ubr - continue; - } else { - if (TBB != IBB && IBB != PredNextBB) // cbr - continue; - } - } - // Remove the unconditional branch at the end, if any. if (TBB && (Cond.empty() || FBB)) { DebugLoc dl = PBB->findBranchDebugLoc();