diff options
author | Steven Wu <stevenwu@apple.com> | 2015-08-28 07:14:10 +0000 |
---|---|---|
committer | Steven Wu <stevenwu@apple.com> | 2015-08-28 07:14:10 +0000 |
commit | 5528da76ef8419ea509cccc87b35e035ef65f9fb (patch) | |
tree | 96b30f952de4c73cfb049428b70538c4f682cdc3 /clang/lib/CodeGen/CGCall.cpp | |
parent | 1e5a8c1a5ce3d82b40c324ee55271b9e405aec5c (diff) | |
download | bcm5719-llvm-5528da76ef8419ea509cccc87b35e035ef65f9fb.tar.gz bcm5719-llvm-5528da76ef8419ea509cccc87b35e035ef65f9fb.zip |
Revert r246214 and r246213
These two commits causes llvm LTO bootstrap to hang in ScalarEvolution.
llvm-svn: 246282
Diffstat (limited to 'clang/lib/CodeGen/CGCall.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGCall.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index fac25168631..74a47bfc2b6 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -1412,8 +1412,7 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI, 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. |