Take care another assert:
struct A {
struct B;
};
struct A::B {
void m() {} // Assertion failed: getContainingDC(DC) == CurContext && "The next DeclContext should be lexically contained in the current one."
};
Introduce DeclContext::getLexicalParent which may be different from DeclContext::getParent when nested-names are involved, e.g:
namespace A {
struct S;
}
struct A::S {}; // getParent() == namespace 'A'
// getLexicalParent() == translation unit
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59650 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index bfc7607..12ed5ff 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -300,6 +300,21 @@
const_cast<const DeclContext*>(this)->getParent());
}
+ /// getLexicalParent - Returns the containing lexical DeclContext. May be
+ /// different from getParent, e.g.:
+ ///
+ /// namespace A {
+ /// struct S;
+ /// }
+ /// struct A::S {}; // getParent() == namespace 'A'
+ /// // getLexicalParent() == translation unit
+ ///
+ const DeclContext *getLexicalParent() const;
+ DeclContext *getLexicalParent() {
+ return const_cast<DeclContext*>(
+ const_cast<const DeclContext*>(this)->getLexicalParent());
+ }
+
bool isFunctionOrMethod() const {
switch (DeclKind) {
case Decl::Block:
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 88d9a20..c0655cf 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -361,3 +361,12 @@
else
return NULL;
}
+
+const DeclContext *DeclContext::getLexicalParent() const {
+ if (const ScopedDecl *SD = dyn_cast<ScopedDecl>(this))
+ return SD->getLexicalDeclContext();
+ else if (const BlockDecl *BD = dyn_cast<BlockDecl>(this))
+ return BD->getParentContext();
+ else
+ return NULL;
+}
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index d6d9845..941f40f 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -53,10 +53,10 @@
// A C++ inline method is parsed *after* the topmost class it was declared in
// is fully parsed (it's "complete").
// The parsing of a C++ inline method happens at the declaration context of
- // the topmost (non-nested) class it is declared in.
+ // the topmost (non-nested) class it is lexically declared in.
assert(isa<CXXRecordDecl>(MD->getParent()) && "C++ method not in Record.");
DC = MD->getParent();
- while (CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(DC->getParent()))
+ while (CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(DC->getLexicalParent()))
DC = RD;
// Return the declaration context of the topmost class the inline method is
@@ -70,7 +70,7 @@
if (ScopedDecl *SD = dyn_cast<ScopedDecl>(DC))
return SD->getLexicalDeclContext();
- return DC->getParent();
+ return DC->getLexicalParent();
}
void Sema::PushDeclContext(DeclContext *DC) {
diff --git a/test/SemaCXX/nested-name-spec.cpp b/test/SemaCXX/nested-name-spec.cpp
index b22d8dc..18cb3b4 100644
--- a/test/SemaCXX/nested-name-spec.cpp
+++ b/test/SemaCXX/nested-name-spec.cpp
@@ -45,12 +45,19 @@
namespace A2 {
typedef int INT;
struct RC;
+ struct CC {
+ struct NC;
+ };
}
struct A2::RC {
INT x;
};
+struct A2::CC::NC {
+ void m() {}
+};
+
void f3() {
N::x = 0; // expected-error {{use of undeclared identifier 'N'}}
int N;