From 1398e08598b47db3e5521779f5996841bc2f84e9 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 26 Oct 2015 18:41:13 +0000 Subject: [PATCH] Remove assert(false) in favor of asserting the if conditional it is contained within. Also adjust the code to avoid 3 redundant map lookups. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251327 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/Analysis.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/CodeGen/Analysis.cpp b/lib/CodeGen/Analysis.cpp index a13ab0d8b8d..75579a2b455 100644 --- a/lib/CodeGen/Analysis.cpp +++ b/lib/CodeGen/Analysis.cpp @@ -649,18 +649,15 @@ bool llvm::canBeOmittedFromSymbolTable(const GlobalValue *GV) { static void collectFuncletMembers( DenseMap &FuncletMembership, int Funclet, const MachineBasicBlock *MBB) { + // Add this MBB to our funclet. + auto P = FuncletMembership.insert(std::make_pair(MBB, Funclet)); + // Don't revisit blocks. - if (FuncletMembership.count(MBB) > 0) { - if (FuncletMembership[MBB] != Funclet) { - assert(false && "MBB is part of two funclets!"); - report_fatal_error("MBB is part of two funclets!"); - } + if (!P.second) { + assert(P.first->second == Funclet && "MBB is part of two funclets!"); return; } - // Add this MBB to our funclet. - FuncletMembership[MBB] = Funclet; - bool IsReturn = false; int NumTerminators = 0; for (const MachineInstr &MI : MBB->terminators()) { -- 2.34.1