summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGCall.cpp
diff options
context:
space:
mode:
authorPiotr Padlewski <prazek@google.com>2015-08-21 19:49:41 +0000
committerPiotr Padlewski <prazek@google.com>2015-08-21 19:49:41 +0000
commitfa0e11efdd5252fd33bfdf7970f5bd0f6a613302 (patch)
tree40493a7b6011635dce5bf3356dd420847c906591 /clang/lib/CodeGen/CGCall.cpp
parent705ffc1794449ffedf85444582c92c9636b9b987 (diff)
downloadbcm5719-llvm-fa0e11efdd5252fd33bfdf7970f5bd0f6a613302.tar.gz
bcm5719-llvm-fa0e11efdd5252fd33bfdf7970f5bd0f6a613302.zip
Revert "Generating assumption loads of vptr after ctor call (fixed)"
Reverting because of 245721 This reverts commit 552658e2b60543c928030b09cc9b5dfcb40c3f28. llvm-svn: 245727
Diffstat (limited to 'clang/lib/CodeGen/CGCall.cpp')
-rw-r--r--clang/lib/CodeGen/CGCall.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 80feb2dc5c2..f40dd086481 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.
OpenPOWER on IntegriCloud