From: David Majnemer Date: Tue, 31 Mar 2015 22:43:56 +0000 (+0000) Subject: [WinEH] ExitingScope is vacuously true if !PoppedCatches.empty() X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6fb716e0fc14f1cc1c7e4aa8bb56f8545b0fd26;p=oota-llvm.git [WinEH] ExitingScope is vacuously true if !PoppedCatches.empty() Remove a redundant condition, no functional change intended. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233770 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp b/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp index e2235fbc044..64af04087e7 100644 --- a/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp +++ b/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp @@ -378,7 +378,6 @@ void WinEHNumbering::processCallSite(ArrayRef Actions, } bool EnteringScope = (int)Actions.size() > FirstMismatch; - bool ExitingScope = (int)HandlerStack.size() > FirstMismatch; // Don't recurse while we are looping over the handler stack. Instead, defer // the numbering of the catch handlers until we are done popping. @@ -396,7 +395,7 @@ void WinEHNumbering::processCallSite(ArrayRef Actions, // We need to create a new state number if we are exiting a try scope and we // will not push any more actions. int TryHigh = NextState - 1; - if (ExitingScope && !EnteringScope && !PoppedCatches.empty()) { + if (!EnteringScope && !PoppedCatches.empty()) { createUnwindMapEntry(currentEHNumber(), nullptr); ++NextState; }