Merge pull request #38439 from egorzhdan/cxx-string-npos

C++ Interop: improve skipping already imported struct members

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -3502,6 +3502,10 @@ namespace {
       SmallVector<ConstructorDecl *, 4> ctors;
       SmallVector<TypeDecl *, 4> nestedTypes;
 
+      // Store the already imported members in a set to avoid importing the same
+      // decls multiple times.
+      SmallPtrSet<clang::Decl *, 16> importedMembers;
+
       // FIXME: Import anonymous union fields and support field access when
       // it is nested in a struct.
 
@@ -3520,6 +3524,12 @@ namespace {
           }
         }
 
+        // If we've already imported this decl & added it to the resulting
+        // struct, skip it so we don't add the same member twice.
+        if (!importedMembers.insert(m->getCanonicalDecl()).second) {
+          continue;
+        }
+
         auto nd = dyn_cast<clang::NamedDecl>(m);
         if (!nd) {
           // We couldn't import the member, so we can't reference it in Swift.
@@ -3548,12 +3558,6 @@ namespace {
           }
         }
 
-        // If we've already imported this decl, skip it so we don't add the same
-        // member twice.
-        if (Impl.ImportedDecls.find({nd->getCanonicalDecl(), getVersion()}) !=
-            Impl.ImportedDecls.end())
-          continue;
-
         // If we encounter an IndirectFieldDecl, ensure that its parent is
         // importable before attempting to import it because they are dependent
         // when it comes to getter/setter generation.

test/Interop/Cxx/namespace/Inputs/module.modulemap

@@ -32,3 +32,8 @@ module TemplatesSecondHeader {
   header "templates-second-header.h"
   requires cplusplus
 }
+
+module TemplatesWithForwardDecl {
+  header "templates-with-forward-decl.h"
+  requires cplusplus
+}

test/Interop/Cxx/namespace/Inputs/templates-with-forward-decl.h

@@ -0,0 +1,37 @@
+#ifndef TEST_INTEROP_CXX_NAMESPACE_INPUTS_TEMPLATES_WITH_FORWARD_DECL_H
+#define TEST_INTEROP_CXX_NAMESPACE_INPUTS_TEMPLATES_WITH_FORWARD_DECL_H
+
+namespace NS1 {
+
+template <typename T>
+struct Decl;
+
+typedef Decl<int> di;
+
+} // namespace NS1
+
+namespace NS1 {
+
+template <typename T>
+struct ForwardDeclared;
+
+template <typename T>
+struct Decl {
+  typedef T MyInt;
+  ForwardDeclared<T> fwd;
+  const static MyInt intValue = -1;
+};
+
+template <typename T>
+const typename Decl<T>::MyInt Decl<T>::intValue;
+
+} // namespace NS1
+
+namespace NS1 {
+
+template <typename T>
+struct ForwardDeclared {};
+
+} // namespace NS1
+
+#endif // TEST_INTEROP_CXX_NAMESPACE_INPUTS_TEMPLATES_WITH_FORWARD_DECL_H

test/Interop/Cxx/namespace/templates-with-forward-decl-module-interface.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=TemplatesWithForwardDecl -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK: extension NS1 {
+// CHECK:   struct __CxxTemplateInstN3NS14DeclIiEE {
+// CHECK:     typealias MyInt = Int32
+// CHECK:     var fwd: NS1.__CxxTemplateInstN3NS115ForwardDeclaredIiEE
+// CHECK:     static let intValue: NS1.__CxxTemplateInstN3NS14DeclIiEE.MyInt
+// CHECK:   }
+// CHECK: }