maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use DeclContext::getLookupContext wherever necessary to ensure that we look through transparent contexts 

llvm-svn: 61861
This commit is contained in:
Douglas Gregor 2009-01-07 16:34:42 +00:00
parent 4bba1ed9bc
commit e955880357
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/include/clang/AST/Decl.h
View File

@ -195,7 +195,7 @@ public:
// be defined inside or outside a function etc).
bool isDefinedOutsideFunctionOrMethod() const {
if (getDeclContext())
return !getDeclContext()->isFunctionOrMethod();
return !getDeclContext()->getLookupContext()->isFunctionOrMethod();
else
return true;
}
@ -420,7 +420,7 @@ public:
if (getKind() != Decl::Var)
return false;
if (const DeclContext *DC = getDeclContext())
return DC->isFunctionOrMethod();
return DC->getLookupContext()->isFunctionOrMethod();
return false;
}
@ -428,9 +428,11 @@ public:
bool isFileVarDecl() const {
if (getKind() != Decl::Var)
return false;
const DeclContext *Ctx = getDeclContext()->getLookupContext();
if (isa<TranslationUnitDecl>(Ctx) || isa<NamespaceDecl>(Ctx) )
return true;
if (const DeclContext *Ctx = getDeclContext()) {
Ctx = Ctx->getLookupContext();
if (isa<TranslationUnitDecl>(Ctx) || isa<NamespaceDecl>(Ctx) )
return true;
}
return false;
}

5
clang/lib/Sema/SemaDecl.cpp
View File

@ -116,7 +116,8 @@ void Sema::PushOnScopeChains(NamedDecl *D, Scope *S) {
// in this case the class name or enumeration name is hidden.
if (TagDecl *TD = dyn_cast<TagDecl>(D)) {
// We are pushing the name of a tag (enum or class).
if (CurContext == TD->getDeclContext()) {
if (CurContext->getLookupContext()
== TD->getDeclContext()->getLookupContext()) {
// We're pushing the tag into the current context, which might
// require some reshuffling in the identifier resolver.
IdentifierResolver::iterator
@ -679,7 +680,7 @@ void Sema::CheckForFileScopedRedefinitions(Scope *S, VarDecl *VD) {
bool VDIsTentative = isTentativeDefinition(VD);
bool VDIsIncompleteArray = VD->getType()->isIncompleteArrayType();
// FIXME: I don't this will actually see all of the
// FIXME: I don't think this will actually see all of the
// redefinitions. Can't we check this property on-the-fly?
for (IdentifierResolver::iterator
I = IdResolver.begin(VD->getIdentifier(),