commit 5528da76ef8419ea509cccc87b35e035ef65f9fb
author Steven Wu <stevenwu@apple.com> Fri Aug 28 07:14:10 2015 +0000
committer Steven Wu <stevenwu@apple.com> Fri Aug 28 07:14:10 2015 +0000
tree 96b30f952de4c73cfb049428b70538c4f682cdc3
parent 1e5a8c1a5ce3d82b40c324ee55271b9e405aec5c

Revert r246214 and r246213

These two commits causes llvm LTO bootstrap to hang in ScalarEvolution.

llvm-svn: 246282

clang/lib/CodeGen/CGCall.cpp

diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index fac2516..74a47bf 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -1412,8 +1412,7 @@
 
     if (const FunctionDecl *Fn = dyn_cast<FunctionDecl>(TargetDecl)) {
       const FunctionProtoType *FPT = Fn->getType()->getAs<FunctionProtoType>();
-      if (FPT && !isUnresolvedExceptionSpec(FPT->getExceptionSpecType()) &&
-          FPT->isNothrow(getContext()))
+      if (FPT && FPT->isNothrow(getContext()))
         FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
       // Don't use [[noreturn]] or _Noreturn for a call to a virtual function.
       // These attributes are not inherited by overloads.