[modules] Fix some more cases where we used to reject a conflict between two
declarations that are not simultaneously visible, and where at least one of
them has internal/no linkage.
llvm-svn: 253283
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index b727890..eb010e9 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -8684,9 +8684,11 @@
assert(!R.isAmbiguous() && !R.empty());
// Check if we have a previous declaration with the same name.
- NamedDecl *PrevDecl = LookupSingleName(S, Alias, AliasLoc, LookupOrdinaryName,
- ForRedeclaration);
- if (PrevDecl && !isDeclInScope(PrevDecl, CurContext, S))
+ LookupResult PrevR(*this, Alias, AliasLoc, LookupOrdinaryName,
+ ForRedeclaration);
+ LookupQualifiedName(PrevR, CurContext->getRedeclContext());
+ NamedDecl *PrevDecl = PrevR.getAsSingle<NamedDecl>();
+ if (PrevDecl && !isVisible(PrevDecl))
PrevDecl = nullptr;
NamedDecl *ND = R.getFoundDecl();