Merge pull request #69357 from apple/fwd-declarations-fix

NuriAmari · web-flow · commit 103f71630c60 · 2023-10-31T07:43:15.000-07:00
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -1424,6 +1424,7 @@ ClangImporter::create(ASTContext &ctx,
     new (ctx) ClangModuleUnit(*importedHeaderModule, importer->Impl, nullptr);
   importedHeaderModule->addFile(*importer->Impl.ImportedHeaderUnit);
   importedHeaderModule->setHasResolvedImports();
+  importedHeaderModule->setIsNonSwiftModule(true);
 
   importer->Impl.IsReadingBridgingPCH = false;
 
diff --git a/test/ClangImporter/Inputs/incomplete_objc_types_bridging_header.h b/test/ClangImporter/Inputs/incomplete_objc_types_bridging_header.h
@@ -0,0 +1,4 @@
+@class ForwardDeclaredInterface;
+
+ForwardDeclaredInterface *CFunctionReturningAForwardDeclaredInterface();
+void CFunctionTakingAForwardDeclaredInterface(ForwardDeclaredInterface *param);
diff --git a/test/ClangImporter/incomplete_objc_types_bridging_header.swift b/test/ClangImporter/incomplete_objc_types_bridging_header.swift
@@ -0,0 +1,6 @@
+// RUN: %target-swift-frontend -import-objc-header %S/Inputs/incomplete_objc_types_bridging_header.h -enable-upcoming-feature ImportObjcForwardDeclarations -enable-objc-interop -typecheck %s
+
+// REQUIRES: objc_interop
+
+let foo = CFunctionReturningAForwardDeclaredInterface()
+CFunctionTakingAForwardDeclaredInterface(foo)
