Merge pull request #78657 from swiftlang/egorzhdan/6.1-coregraphics-workaround

🍒[cxx-interop] Workaround compiler error when importing CoreGraphics with C++ interop

Author: egorzhdan

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -2193,7 +2193,9 @@ InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleName,
 
   // FIXME: Hack for Darwin.swiftmodule, which cannot be rebuilt with C++
   // interop enabled by the Swift CI because it uses an old host SDK.
-  if (moduleName == "Darwin") {
+  // FIXME: Hack for CoreGraphics.swiftmodule, which cannot be rebuilt because
+  // of a CF_OPTIONS bug (rdar://142762174).
+  if (moduleName == "Darwin" || moduleName == "CoreGraphics") {
     subInvocation.getLangOptions().EnableCXXInterop = false;
     subInvocation.getLangOptions().cxxInteropCompatVersion = {};
     BuildArgs.erase(llvm::remove_if(BuildArgs,

test/Interop/Cxx/objc-correctness/coregraphics.swift

@@ -0,0 +1,9 @@
+// RUN: %target-swift-frontend -typecheck -verify -I %S/Inputs -cxx-interoperability-mode=default %s
+
+ // REQUIRES: objc_interop
+ // REQUIRES: VENDOR=apple
+
+ import CoreGraphics
+
+ var _: CGBitmapInfo! = nil
+