DO NOT MERGE

Author: egorzhdan

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -13,12 +13,14 @@
 import SIL
 import OptimizerBridging
 import Parse
+import std
 
 @_cdecl("initializeSwiftModules")
 public func initializeSwiftModules() {
   registerSILClasses()
   registerSwiftPasses()
   registerRegexParser()
+  std.string()
 }
 
 private func registerPass(

lib/ClangImporter/ImportDecl.cpp

@@ -3825,7 +3825,15 @@ namespace {
       if (!isCxxRecordImportable(decl))
         return nullptr;
 
-      return VisitRecordDecl(decl);
+      auto result = VisitRecordDecl(decl);
+
+      if (result && decl->getTemplateInstantiationPattern()) {
+        auto &lt = Impl.BridgingHeaderLookupTable;
+        addEntryToLookupTable(*lt, const_cast<clang::CXXRecordDecl *>(decl),
+                              Impl.getNameImporter());
+      }
+
+      return result;
     }
 
     bool isSpecializationDepthGreaterThan(