Merge pull request #69365 from apple/egorzhdan/5.10-circular-requests

🍒[cxx-interop] Avoid circular reference errors when importing C++ structs

Author: egorzhdan

lib/ClangImporter/ImportDecl.cpp

@@ -2197,6 +2197,13 @@ namespace {
       // FIXME: Figure out what to do with superclasses in C++. One possible
       // solution would be to turn them into members and add conversion
       // functions.
+      if (auto cxxRecordDecl = dyn_cast<clang::CXXRecordDecl>(decl)) {
+        for (auto base : cxxRecordDecl->bases()) {
+          if (auto *baseRecordDecl = base.getType()->getAsCXXRecordDecl()) {
+            Impl.importDecl(baseRecordDecl, getVersion());
+          }
+        }
+      }
 
       // Import each of the members.
       SmallVector<VarDecl *, 4> members;

test/Interop/Cxx/class/inheritance/Inputs/module.modulemap

@@ -11,6 +11,11 @@ module Polymorphism {
   requires cplusplus
 }
 
+module ReferenceToDerived {
+  header "reference-to-derived.h"
+  requires cplusplus
+}
+
 module SubTypes {
   header "sub-types.h"
 }

test/Interop/Cxx/class/inheritance/Inputs/reference-to-derived.h

@@ -0,0 +1,13 @@
+class E;
+
+class C {
+public:
+  E *getE() const;
+};
+
+class D : public C {};
+
+class E : public D {
+public:
+  D *getD() const;
+};

test/Interop/Cxx/class/inheritance/reference-to-derived-irgen.swift

@@ -0,0 +1,6 @@
+// RUN: %target-swift-emit-ir -I %S/Inputs -enable-experimental-cxx-interop %s -validate-tbd-against-ir=none
+// We should not fail with a circular reference error here.
+
+import ReferenceToDerived
+
+func foo(_ x: D) {}