Serialize clang template type before instantiation

Author: hlopko

lib/Serialization/Deserialization.cpp

@@ -1301,7 +1301,6 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
                                            importedFromClang, isStatic);
 
     DeclBaseName name = getDeclBaseName(IID);
-    llvm::errs() << "YOYOYOOOOO " << name <<"\n";
     pathTrace.addValue(name);
     if (privateDiscriminator)
       pathTrace.addValue(getIdentifier(privateDiscriminator));
@@ -5389,16 +5388,12 @@ class TypeDeserializer {
     }
 
     if (auto clangDecl = nominal->getClangDecl()) {
-      nominal->dump();
       if (auto ctd = dyn_cast<clang::ClassTemplateDecl>(clangDecl)) {
-        ctd->dump();
-        ctd->dump();
         auto clangImporter = static_cast<ClangImporter *>(nominal->getASTContext().getClangModuleLoader());
-        auto genericParams = nominal->getGenericParams();
 
         SmallVector<Type, 2> typesOfgenericArgs;
-        for (auto arg : *genericParams) {
-          typesOfgenericArgs.push_back(arg->getDeclaredInterfaceType());
+        for (auto arg : genericArgs) {
+          typesOfgenericArgs.push_back(arg);
         }
 
         SmallVector<clang::TemplateArgument, 2> templateArguments;

lib/Serialization/Serialization.cpp

@@ -75,6 +75,21 @@ using namespace llvm::support;
 using swift::version::Version;
 using llvm::BCBlockRAII;
 
+
+static Type getResultInterfaceTypeForSerialization(Type t) {
+  if (!t)
+    return t;
+  if (auto nominalDecl = t->getAnyNominal()) {
+    if (auto structDecl = dyn_cast<StructDecl>(nominalDecl)) {
+      if (auto templateInstantiationType =
+              structDecl->getTemplateInstantiationType()) {
+        return templateInstantiationType;
+      }
+    }
+  }
+  return t;
+}
+
 ASTContext &SerializerBase::getASTContext() {
   return M->getASTContext();
 }
@@ -628,13 +643,14 @@ DeclID Serializer::addDeclRef(const Decl *D, bool allowTypeAliasXRef) {
 }
 
 serialization::TypeID Serializer::addTypeRef(Type ty) {
+  auto tyToSerialize = getResultInterfaceTypeForSerialization(ty);
 #ifndef NDEBUG
-  PrettyStackTraceType trace(M->getASTContext(), "serializing", ty);
+  PrettyStackTraceType trace(M->getASTContext(), "serializing", tyToSerialize);
   assert(M->getASTContext().LangOpts.AllowModuleWithCompilerErrors ||
-         !ty || !ty->hasError() && "serializing type with an error");
+         !tyToSerialize || !ty->hasError() && "serializing type with an error");
 #endif
 
-  return TypesToSerialize.addRef(ty);
+  return TypesToSerialize.addRef(tyToSerialize);
 }
 
 serialization::ClangTypeID Serializer::addClangTypeRef(const clang::Type *ty) {
@@ -1882,19 +1898,6 @@ void Serializer::writeCrossReference(const Decl *D) {
     return;
   }
 
-  if (D->hasClangNode()) {
-    if (auto ctsd = dyn_cast<clang::ClassTemplateSpecializationDecl>(
-            D->getClangDecl())) {
-      abbrCode = DeclTypeAbbrCodes[XRefClangTemplateInstantiationLayout::Code];
-      // auto clangTypeID = addClangTypeRef(ctsd->getTypeForDecl());
-
-      // XRefClangTemplateInstantiationLayout::emitRecord(
-      //     Out, ScratchRecord, abbrCode, clangTypeID);
-
-      // return;
-    }
-  }
-
   bool isProtocolExt = D->getDeclContext()->getExtendedProtocolDecl();
   if (auto type = dyn_cast<TypeDecl>(D)) {
     abbrCode = DeclTypeAbbrCodes[XRefTypePathPieceLayout::Code];
@@ -2218,13 +2221,6 @@ static void collectDependenciesFromType(llvm::SmallSetVector<Type, 4> &seen,
       return;
     if (contextDependsOn(nominal, excluding))
       return;
-    if (auto clangDecl = nominal->getClangDecl()) {
-      auto &clangASTContext = nominal->getClangDecl()->getASTContext();
-      if (auto ctsd = dyn_cast<clang::ClassTemplateSpecializationDecl>(clangDecl)) {
-        seen.insert(dyn_cast<StructDecl>(nominal)->getTemplateInstantiationType());
-        return;
-      }
-    }
     seen.insert(nominal->getDeclaredInterfaceType());
   });
 }
@@ -4688,7 +4684,6 @@ void Serializer::writeAllDeclsAndTypes() {
   registerDeclTypeAbbr<XRefOperatorOrAccessorPathPieceLayout>();
   registerDeclTypeAbbr<XRefGenericParamPathPieceLayout>();
   registerDeclTypeAbbr<XRefInitializerPathPieceLayout>();
-  registerDeclTypeAbbr<XRefClangTemplateInstantiationLayout>();
 
   registerDeclTypeAbbr<AbstractProtocolConformanceLayout>();
   registerDeclTypeAbbr<NormalProtocolConformanceLayout>();

test/Interop/Cxx/templates/Inputs/SwiftClassInstantiationInNamespaceModule.swift

@@ -1,13 +1,13 @@
 import ClassTemplateInNamespace
 
-public func receiveShip(_ i: inout Space.Ship<Yolo>) {}
+public func receiveShip(_ i: inout Space.Ship<Bool>) {}
 
-public func returnShip() -> Space.Ship<Yolo> {
-  return Space.Ship<Yolo>()
+public func returnShip() -> Space.Ship<Bool> {
+  return Space.Ship<Bool>()
 }
 
-// public func receiveShipWithEngine(_ i: inout Space.Ship<Engine.Turbojet>) {}
+public func receiveShipWithEngine(_ i: inout Space.Ship<Engine.Turbojet>) {}
 
-// public func returnShipWithEngine() -> Space.Ship<Engine.Turbojet> {
-//   return Space.Ship<Engine.Turbojet>()
-// }
+public func returnShipWithEngine() -> Space.Ship<Engine.Turbojet> {
+  return Space.Ship<Engine.Turbojet>()
+}

test/Interop/Cxx/templates/Inputs/class-template-in-namespace.h

@@ -1,16 +1,12 @@
 #ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H
 #define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H
 
-struct Yolo {};
-
 namespace Space {
-
-template <class T> struct Ship {T t;};
-
+    template <class T> struct Ship { T t; };
 } // namespace Space
 
 namespace Engine {
     struct Turbojet {};
-}
+} // namespace Engine
 
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H

test/Interop/Cxx/templates/class-template-in-namespace-module-interface.swift

@@ -1,14 +1,8 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=ClassTemplateInNamespace -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK: enum Space {
-// CHECK:   struct __CxxTemplateInstN5Space4ShipIiEE {
-// CHECK:     var t: Int32
-// CHECK:     init()
-// CHECK:     init(t: Int32)
-// CHECK:   }
 // CHECK:   struct Ship<T> {
 // CHECK:   }
-// CHECK:   typealias Orbiter = Space.__CxxTemplateInstN5Space4ShipIiEE
 // CHECK: }
 // CHECK: enum Engine {
 // CHECK:   struct Turbojet {

test/Interop/Cxx/templates/swift-class-instantiation-in-namespace-module-interface.swift

@@ -3,7 +3,9 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=SwiftClassTemplateInNamespaceModule -I %t/ -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK: import ClassTemplateInNamespace
-// CHECK: public func receiveShip(_ i: inout ClassTemplateInNamespace.Space.__CxxTemplateInstN5Space4ShipIbEE)
-// CHECK: public func returnShip() -> ClassTemplateInNamespace.Space.__CxxTemplateInstN5Space4ShipIbEE
-// CHECK: public func receiveShipWithEngine(_ i: inout ClassTemplateInNamespace.Space.__CxxTemplateInstN5Space4ShipIN6Engine8TurbojetEEE)
-// CHECK: public func returnShipWithEngine() -> ClassTemplateInNamespace.Space.__CxxTemplateInstN5Space4ShipIN6Engine8TurbojetEEE
+// CHECK: func receiveShip(_ i: inout Space.__CxxTemplateInstN5Space4ShipIbEE)
+// CHECK: func receiveShipWithEngine(_ i: inout Space.__CxxTemplateInstN5Space4ShipIN6Engine8TurbojetEEE)
+
+// CHECK: func returnShip() -> Space.__CxxTemplateInstN5Space4ShipIbEE
+// CHECK: func returnShipWithEngine() -> Space.__CxxTemplateInstN5Space4ShipIN6Engine8TurbojetEEE
+