From: Benjamin Kramer Date: Fri, 3 Aug 2012 15:43:22 +0000 (+0000) Subject: Flesh out test for defaulted key functions a bit more. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c23aca44753ff65303fb19d4d6d2114018629f07;p=clang Flesh out test for defaulted key functions a bit more. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161243 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 747b3529ce..d5df63f7d1 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/lib/AST/RecordLayoutBuilder.cpp @@ -2351,6 +2351,7 @@ RecordLayoutBuilder::ComputeKeyFunction(const CXXRecordDecl *RD) { if (MD->hasInlineBody()) continue; + // Ignore inline deleted or defaulted functions. if (!MD->isUserProvided()) continue; diff --git a/test/CodeGenCXX/cxx11-vtable-key-function.cpp b/test/CodeGenCXX/cxx11-vtable-key-function.cpp index 705a4addf6..cd2ab59506 100644 --- a/test/CodeGenCXX/cxx11-vtable-key-function.cpp +++ b/test/CodeGenCXX/cxx11-vtable-key-function.cpp @@ -1,11 +1,38 @@ // RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -std=c++11 | FileCheck %s // PR13424 +namespace Test1 { struct X { - virtual ~X() = default; - virtual void f(); + virtual ~X(); // Key function. + virtual void f(); // Not a key function. +}; + +X::~X() = default; + +// Verify that the vtable is emitted. +// CHECK: @_ZTVN5Test11XE = unnamed_addr constant +} + +namespace Test2 { +struct X { + virtual ~X() = default; // Not a key function. + virtual void f(); // Key function. +}; + +void X::f() {} + +// Verify that the vtable is emitted. +// CHECK: @_ZTVN5Test21XE = unnamed_addr constant +} + +namespace Test3 { +struct X { + virtual ~X() = delete; // Not a key function. + virtual void f(); // Key function. }; void X::f() {} -// CHECK: @_ZTV1X = unnamed_addr constant +// Verify that the vtable is emitted. +// CHECK: @_ZTVN5Test31XE = unnamed_addr constant +}