diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2010-03-07 05:49:51 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2010-03-07 05:49:51 +0000 |
commit | d6a9324e9b0f77917a6f56781aba80f0d39ded55 (patch) | |
tree | d163aaccce060bdedb8c0a59e68eca67091c46ae | |
parent | 96df6cfd1220d629fca2ae4fec2aecfdf35ad847 (diff) |
Fix for PR6294: we should only delay recording nested dynamic classes if they
are lexically nested. Othewise, we never end up recording semantically nested
classes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97900 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 | ||||
-rw-r--r-- | test/CodeGenCXX/default-destructor-nested.cpp | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index ec1939e5ec..935adcf1b6 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -5030,7 +5030,7 @@ void Sema::ActOnTagFinishDefinition(Scope *S, DeclPtrTy TagD, // Exit this scope of this tag's definition. PopDeclContext(); - if (isa<CXXRecordDecl>(Tag) && !Tag->getDeclContext()->isRecord()) + if (isa<CXXRecordDecl>(Tag) && !Tag->getLexicalDeclContext()->isRecord()) RecordDynamicClassesWithNoKeyFunction(*this, cast<CXXRecordDecl>(Tag), RBraceLoc); diff --git a/test/CodeGenCXX/default-destructor-nested.cpp b/test/CodeGenCXX/default-destructor-nested.cpp new file mode 100644 index 0000000000..86942743d4 --- /dev/null +++ b/test/CodeGenCXX/default-destructor-nested.cpp @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 %s -emit-llvm-only +// PR6294 + +class A { + virtual ~A(); +}; +class B { + class C; +}; +class B::C : public A { + C(); +}; +B::C::C() {} |