Polish

Author: hlopko

include/swift/AST/Decl.h

@@ -3396,7 +3396,7 @@ class StructDecl final : public NominalTypeDecl {
   // with a name prefixed with `__CxxTemplateInst`. However for proper
   // serialization we need to have an access to the bound generic type
   // that would have produced this instantiation. This field contains
-  // such type.
+  // that type.
   //
   // The field is set during the typechecking at the time when we
   // instantiate the C++ class template.

lib/ClangImporter/ImportDecl.cpp

@@ -3977,10 +3977,6 @@ namespace {
       if (correctSwiftName)
         markAsVariant(result, *correctSwiftName);
 
-      if (decl->isInvalidDecl()) {
-        return nullptr;
-      }
-
       return result;
     }
 

lib/ClangImporter/Serializability.cpp

@@ -73,8 +73,8 @@ class SerializationPathFinder {
       if (!isa<TypeAliasDecl>(swiftDecl)) {
         // Only accept this declaration if it round-trips.
         if (auto swiftClangDecl = swiftDecl->getClangDecl())
-            if (isSameDecl(decl, swiftClangDecl))
-              return swiftDecl;
+          if (isSameDecl(decl, swiftClangDecl))
+            return swiftDecl;
       }
     }
 

lib/Serialization/DeclTypeRecordNodes.def

@@ -196,7 +196,6 @@ OTHER(CLANG_TYPE, 253)
 
 OTHER(DERIVATIVE_FUNCTION_CONFIGURATION, 254)
 
-
 #undef RECORD
 #undef DECLTYPERECORDNODES_HAS_RECORD_VAL
 #undef RECORD_VAL

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

@@ -10,15 +10,3 @@ namespace Engine {
 } // namespace Engine
 
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_FOR_SWIFT_MODULE_H
-
-// 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 Ship<T> {
-// CHECK:   }
-// CHECK: }
-// CHECK: enum Engine {
-// CHECK:   struct Turbojet {
-// CHECK:     init()
-// CHECK:   }
-// CHECK: }

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

@@ -11,23 +11,3 @@ using Orbiter = Ship<void(bool)>;
 } // namespace Space
 
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_IN_NAMESPACE_H
-
-// namespace Space {
-//     template <class T> struct Ship { T t; };
-// } // namespace Space
-
-// namespace Engine {
-//     struct Turbojet {};
-// } // namespace Engine
-
-// 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 Ship<T> {
-// CHECK:   }
-// CHECK: }
-// CHECK: enum Engine {
-// CHECK:   struct Turbojet {
-// CHECK:     init()
-// CHECK:   }
-// CHECK: }