From: Dale Johannesen <dalej@apple.com>
Date: Fri, 16 May 2008 23:18:52 +0000 (+0000)
Subject: Less conservative verison of previous patch,
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f7580c5ebfb3ab79c4be77cc5b85408bf3a8cf4;p=oota-llvm.git

Less conservative verison of previous patch,
suggested by Duncan.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51211 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp
index d2f3a8437cf..d4194a1060e 100644
--- a/lib/Transforms/IPO/PruneEH.cpp
+++ b/lib/Transforms/IPO/PruneEH.cpp
@@ -73,10 +73,10 @@ bool PruneEH::runOnSCC(const std::vector<CallGraphNode *> &SCC) {
   for (unsigned i = 0, e = SCC.size();
        (!SCCMightUnwind || !SCCMightReturn) && i != e; ++i) {
     Function *F = SCC[i]->getFunction();
-    if (F == 0 || (F->hasWeakLinkage() && !F->doesNotThrow())) {
+    if (F == 0) {
       SCCMightUnwind = true;
       SCCMightReturn = true;
-    } else if (F->isDeclaration()) {
+    } else if (F->isDeclaration() || F->hasWeakLinkage()) {
       SCCMightUnwind |= !F->doesNotThrow();
       SCCMightReturn |= !F->doesNotReturn();
     } else {