diff options
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/virtual-function-calls.cpp | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 4e8e724ea5..6aabd64f9b 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -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); } diff --git a/test/CodeGenCXX/virtual-function-calls.cpp b/test/CodeGenCXX/virtual-function-calls.cpp index 46e7b2d37f..e1b380fe73 100644 --- a/test/CodeGenCXX/virtual-function-calls.cpp +++ b/test/CodeGenCXX/virtual-function-calls.cpp @@ -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 + } +} |