[cxx-interop] Fix SIL deserialization error, pt 2

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -9519,12 +9519,6 @@ Decl *ClangImporter::Implementation::importDeclAndCacheImpl(
   if (!SuperfluousTypedefsAreTransparent && TypedefIsSuperfluous)
     return nullptr;
 
-  if (ClangDecl->getDeclContext()->isNamespace()) {
-    addEntryToLookupTable(*BridgingHeaderLookupTable,
-                          const_cast<clang::NamedDecl *>(ClangDecl),
-                          getNameImporter());
-  }
-
   return Result;
 }
 

lib/ClangImporter/SwiftLookupTable.cpp

@@ -1925,13 +1925,24 @@ void importer::addEntryToLookupTable(SwiftLookupTable &table,
   // Walk the members of any context that can have nested members.
   if (isa<clang::TagDecl>(named) || isa<clang::ObjCInterfaceDecl>(named) ||
       isa<clang::ObjCProtocolDecl>(named) ||
-      isa<clang::ObjCCategoryDecl>(named) || isa<clang::NamespaceDecl>(named)) {
+      isa<clang::ObjCCategoryDecl>(named)) {
     clang::DeclContext *dc = cast<clang::DeclContext>(named);
     for (auto member : dc->decls()) {
       if (auto namedMember = dyn_cast<clang::NamedDecl>(member))
         addEntryToLookupTable(table, namedMember, nameImporter);
     }
   }
+  if (isa<clang::NamespaceDecl>(named)) {
+    for (auto redecl : named->redecls()) {
+      auto *dc = cast<clang::DeclContext>(redecl);
+      for (auto member : dc->decls()) {
+        if (!member->isCanonicalDecl())
+          continue;
+        if (auto namedMember = dyn_cast<clang::NamedDecl>(member))
+          addEntryToLookupTable(table, namedMember, nameImporter);
+      }
+    }
+  }
 }
 
 /// Returns the nearest parent of \p module that is marked \c explicit in its