Tests and fixes for templates declared within (non-template)

classes. Test case from Anders Carlsson, fix from Piotr Rak!

llvm-svn: 67817

1 files changed, 7 insertions, 6 deletions

diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index 616ee3dd932..770f9301e61 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -600,10 +600,11 @@ Sema::CppLookupName(Scope *S, DeclarationName Name,
       // base classes, we never need to perform qualified lookup
       // because all of the members are on top of the identifier
       // chain.
-      if (isa<RecordDecl>(Ctx) &&
-          (R = LookupQualifiedName(Ctx, Name, NameKind, RedeclarationOnly)))
-        return std::make_pair(true, R);
-
+      if (isa<RecordDecl>(Ctx)) {
+        R = LookupQualifiedName(Ctx, Name, NameKind, RedeclarationOnly);
+        if (R || RedeclarationOnly)
+          return std::make_pair(true, R);
+      }
       if (Ctx->getParent() != Ctx->getLexicalParent()) {
         // It is out of line defined C++ method or struct, we continue
         // doing name lookup in parent context. Once we will find namespace
@@ -611,8 +612,8 @@ Sema::CppLookupName(Scope *S, DeclarationName Name,
         // using-directives later.
         for (OutOfLineCtx = Ctx; OutOfLineCtx && !OutOfLineCtx->isFileContext();
              OutOfLineCtx = OutOfLineCtx->getParent()) {
-          if ((R = LookupQualifiedName(OutOfLineCtx, Name, NameKind,
-                                      RedeclarationOnly)))
+          R = LookupQualifiedName(OutOfLineCtx, Name, NameKind, RedeclarationOnly);
+          if (R || RedeclarationOnly)
             return std::make_pair(true, R);
         }
       }