Merge pull request #58659 from apple/egorzhdan/cxx-namespace-lookup-fix

egorzhdan · web-flow · commit dabaa690245f · 2022-05-04T18:51:08.000+01:00
[cxx-interop] Fix namespace lookup
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -2725,7 +2725,7 @@ static bool isVisibleFromModule(const ClangModuleUnit *ModuleFilter,
   // Handle redeclarable Clang decls by checking each redeclaration.
   bool IsTagDecl = isa<clang::TagDecl>(D);
   if (!(IsTagDecl || isa<clang::FunctionDecl>(D) || isa<clang::VarDecl>(D) ||
-        isa<clang::TypedefNameDecl>(D))) {
+        isa<clang::TypedefNameDecl>(D) || isa<clang::NamespaceDecl>(D))) {
     return false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2725,7 +2725,7 @@ static bool isVisibleFromModule(const ClangModuleUnit *ModuleFilter,`
`2725`	`2725`	`// Handle redeclarable Clang decls by checking each redeclaration.`
`2726`	`2726`	`bool IsTagDecl = isa<clang::TagDecl>(D);`
`2727`	`2727`	`if (!(IsTagDecl \|\| isa<clang::FunctionDecl>(D) \|\| isa<clang::VarDecl>(D) \|\|`
`2728`		`- isa<clang::TypedefNameDecl>(D))) {`
	`2728`	`+ isa<clang::TypedefNameDecl>(D) \|\| isa<clang::NamespaceDecl>(D))) {`
`2729`	`2729`	`return false;`
`2730`	`2730`	`}`
`2731`	`2731`