Don't emit calls to virtual [[noreturn]] functions as noreturn; overrides of a

[[noreturn]] function are not required to also be [[noreturn]]. We still emit
calls to virtual __attribute__((noreturn)) functions as noreturn; unlike GCC,
we do require overriders to also be noreturn for that attribute.

llvm-svn: 176476
This commit is contained in:
Richard Smith 2013-03-05 08:30:04 +00:00
parent e750491ff3
commit 49af629057
2 changed files with 18 additions and 2 deletions

View File

@ -993,7 +993,10 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
const FunctionProtoType *FPT = Fn->getType()->getAs<FunctionProtoType>();
if (FPT && FPT->isNothrow(getContext()))
FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
if (Fn->isNoReturn())
// Don't use [[noreturn]] or _Noreturn for a call to a virtual function.
// These attributes are not inherited by overloads.
const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(Fn);
if (Fn->isNoReturn() && !(AttrOnCallSite && MD && MD->isVirtual()))
FuncAttrs.addAttribute(llvm::Attribute::NoReturn);
}

View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// RUN: %clang_cc1 %s -std=c++11 -emit-llvm -o - | FileCheck %s
// PR5021
namespace PR5021 {
@ -36,3 +36,16 @@ namespace Test1 {
b->f();
}
}
namespace VirtualNoreturn {
struct A {
[[noreturn]] virtual void f();
};
// CHECK: @_ZN15VirtualNoreturn1f
void f(A *p) {
p->f();
// CHECK: call void %{{[^#]*$}}
// CHECK-NOT: unreachable
}
}