gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix unloading from inline namespaces other than std."

Browse Source 
This reverts commit 1e9984a65312b07f39760f6aec88b0b246fe3d94.
This commit is contained in:
Axel Naumann 2017-02-10 08:29:32 +01:00 committed by sftnight
parent 185b905525
commit 3addec52ea
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Interpreter/DeclUnloader.cpp
View File

@ -737,17 +737,23 @@ bool DeclUnloader::VisitRedeclarable(clang::Redeclarable<T>* R, DeclContext* DC)
bool DeclUnloader::VisitNamespaceDecl(NamespaceDecl* NSD) {
// NamespaceDecl: NamedDecl, DeclContext, Redeclarable
// When unloading a NamedDecl within an inline namespace within the
// NamedDecl needs to be removed from the parent well.
StoredDeclsMap *removeFromParent = nullptr;
// When unloading a NamedDecl within an inline namespace within std the
// NamedDecl needs to be removed from the parent std as well.
// Not sure why, but test/CodeUnloading/NameSpaces.C demonstrates
// that this only affects the std namespace
StoredDeclsMap *removeFromSTD = nullptr;
if (NSD->isInline()) {
if (NamespaceDecl *parent = dyn_cast<NamespaceDecl>(NSD->getParent()))
removeFromParent = parent->getFirstDecl()->getLookupPtr();
if (NamespaceDecl *parent = dyn_cast<NamespaceDecl>(NSD->getParent())) {
if (parent->getNameAsString()=="std") {
if ((parent = m_Sema->getStdNamespace()))
removeFromSTD = m_Sema->getStdNamespace()->getLookupPtr();
}
}
}
bool Successful = VisitRedeclarable(NSD, NSD->getDeclContext());
// Inlined version of VisitDeclContext so we can check against parent
// Inlined version of VisitDeclContext so we can check against removeFromSTD
llvm::SmallVector<Decl*, 64> declsToErase;
for (Decl *D : NSD->noload_decls())
declsToErase.push_back(D);
@ -756,11 +762,11 @@ bool DeclUnloader::VisitRedeclarable(clang::Redeclarable<T>* R, DeclContext* DC)
Successful = Visit(*I) & Successful;
assert(Successful);
if (removeFromParent) {
if (removeFromSTD) {
if (NamedDecl *ND = dyn_cast<NamedDecl>(*I)) {
eraseDeclFromMap(removeFromParent, ND);
eraseDeclFromMap(removeFromSTD, ND);
#ifndef NDEBUG
checkDeclIsGone(removeFromParent, ND);
checkDeclIsGone(removeFromSTD, ND);
#endif
}
}

13
test/CodeUnloading/NameSpaces.C
View File

@ -24,18 +24,6 @@
#undef TEST_NAMESPACE
namespace A{}
namespace A { inline namespace __BBB { int f; } }
namespace A { inline namespace __BBB { int f1; } }
namespace A { inline namespace __BBB { int f2; } }
.undo
A::f2 // expected-error {{no member named 'f2' in namespace 'A'}}
.undo
A::f1 // expected-error {{no member named 'f1' in namespace 'A'}}
.undo
A::f // expected-error {{no member named 'f' in namespace 'A'}}
#include <stdexcept>
.undo
#include <stdexcept>
@ -44,4 +32,5 @@ A::f // expected-error {{no member named 'f' in namespace 'A'}}
101
// CHECK: (int) 101
// expected-no-diagnostics
.q