From ea16606fcd0b097e6cd5e0349f6bb533744e78f2 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 15 Mar 2010 15:26:48 +0000 Subject: During C++ name lookup, use DeclContext::Equals() rather than comparing DeclContext pointers, to avoid having to remember to call getPrimaryContext() everywhere. This is the last part PR6594. llvm-svn: 98546 --- clang/lib/Sema/SemaLookup.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'clang/lib/Sema/SemaLookup.cpp') diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index 615f2f1d84c..6caeec620d0 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -603,8 +603,7 @@ static std::pair findOuterContext(Scope *S) { for (Scope *OuterS = S->getParent(); OuterS; OuterS = OuterS->getParent()) { if (OuterS->getEntity()) { - Lexical - = static_cast(OuterS->getEntity())->getPrimaryContext(); + Lexical = static_cast(OuterS->getEntity()); break; } } @@ -722,8 +721,7 @@ bool Sema::CppLookupName(LookupResult &R, Scope *S) { if (SearchAfterTemplateScope) OutsideOfTemplateParamDC = OuterCtx; - for (; Ctx && Ctx->getPrimaryContext() != OuterCtx; - Ctx = Ctx->getLookupParent()) { + for (; Ctx && !Ctx->Equals(OuterCtx); Ctx = Ctx->getLookupParent()) { // We do not directly look into transparent contexts, since // those entities will be found in the nearest enclosing // non-transparent context. @@ -2307,7 +2305,7 @@ static void LookupVisibleDecls(Scope *S, LookupResult &Result, Entity = (DeclContext *)S->getEntity(); DeclContext *OuterCtx = findOuterContext(S).first; // FIXME - for (DeclContext *Ctx = Entity; Ctx && Ctx->getPrimaryContext() != OuterCtx; + for (DeclContext *Ctx = Entity; Ctx && !Ctx->Equals(OuterCtx); Ctx = Ctx->getLookupParent()) { if (ObjCMethodDecl *Method = dyn_cast(Ctx)) { if (Method->isInstanceMethod()) { -- cgit v1.2.3