summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/CGCall.cpp
diff options
context:
space:
mode:
authorJustin Bogner <mail@justinbogner.com>2015-08-18 05:40:20 +0000
committerJustin Bogner <mail@justinbogner.com>2015-08-18 05:40:20 +0000
commit3c32c83daa5e7ceda3f5cb7cd3bf4059c197a202 (patch)
tree98bf51e1b3a2870332dc6c05d56ac88b32a8da5a /clang/lib/CodeGen/CGCall.cpp
parent0081f9185353814969acf8e3af7677eff29f3f63 (diff)
downloadbcm5719-llvm-3c32c83daa5e7ceda3f5cb7cd3bf4059c197a202.tar.gz
bcm5719-llvm-3c32c83daa5e7ceda3f5cb7cd3bf4059c197a202.zip
Revert "Generating assumption loads of vptr after ctor call (fixed)"
Bootstrap bots were failing: http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto_build/6382/ http://bb.pgr.jp/builders/clang-3stage-i686-linux/builds/2969 This reverts r245264. llvm-svn: 245267
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 2511e26e770..f7107b61060 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