Change return value of trivial visibility check.

Previous, if no Decl's were checked, visibility was set to false.  Switch it
so that in cases of no Decl's, return true.  These are the Decl's after being
filtered.  Also remove an unreachable return statement since it is directly
after another return statement.

llvm-svn: 334160
This commit is contained in:
Richard Trieu 2018-06-07 03:20:30 +00:00
parent b92c77d176
commit 8153628f6a
2 changed files with 24 additions and 3 deletions

View File

@ -1452,6 +1452,8 @@ template<typename Filter>
static bool hasVisibleDeclarationImpl(Sema &S, const NamedDecl *D,
llvm::SmallVectorImpl<Module *> *Modules,
Filter F) {
bool HasFilteredRedecls = false;
for (auto *Redecl : D->redecls()) {
auto *R = cast<NamedDecl>(Redecl);
if (!F(R))
@ -1460,6 +1462,8 @@ static bool hasVisibleDeclarationImpl(Sema &S, const NamedDecl *D,
if (S.isVisible(R))
return true;
HasFilteredRedecls = true;
if (Modules) {
Modules->push_back(R->getOwningModule());
const auto &Merged = S.Context.getModulesWithMergedDefinition(R);
@ -1467,7 +1471,11 @@ static bool hasVisibleDeclarationImpl(Sema &S, const NamedDecl *D,
}
}
return false;
// Only return false if there is at least one redecl that is not filtered out.
if (HasFilteredRedecls)
return false;
return true;
}
bool Sema::hasVisibleExplicitSpecialization(
@ -1497,8 +1505,6 @@ bool Sema::hasVisibleMemberSpecialization(
// class definition?
return D->getLexicalDeclContext()->isFileContext();
});
return false;
}
/// Determine whether a declaration is visible to name lookup.

View File

@ -0,0 +1,15 @@
// RUN: %clang_cc1 -fsyntax-only -fmodules %s -verify
// RUN: %clang_cc1 -fsyntax-only %s -verify
// expected-no-diagnostics
template <typename Var>
struct S {
template <unsigned N>
struct Inner { };
template <>
struct Inner<0> { };
};
S<int>::Inner<1> I1;
S<int>::Inner<0> I0;