Merge pull request #79822 from swiftlang/egorzhdan/NSUnderlineStyle

[cxx-interop] Allow AppKit & UIKit to be rebuilt with C++ interop enabled

Author: egorzhdan

lib/ClangImporter/ImportName.cpp

@@ -1861,6 +1861,25 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
     return result;
   }
 
+  // In C++ language mode, CF_OPTIONS/NS_OPTIONS macro has a different
+  // expansion: instead of a forward-declared enum, it expands into a typedef
+  // that is marked as `__attribute__((availability(swift,unavailable)))`, and
+  // an anonymous enum that inherits from the typedef. The logic above imports
+  // the anonymous enum with the desired name based on the typedef's name. In
+  // addition to that, we should make sure the unavailable typedef isn't
+  // imported into Swift to avoid having two types with the same name, which
+  // cause subtle name lookup issues.
+  if (swiftCtx.LangOpts.EnableCXXInterop &&
+      isUnavailableInSwift(D, nullptr, true)) {
+    auto loc = D->getEndLoc();
+    if (loc.isMacroID()) {
+      StringRef macroName =
+          clangSema.getPreprocessor().getImmediateMacroName(loc);
+      if (macroName == "CF_OPTIONS" || macroName == "NS_OPTIONS")
+        return ImportedName();
+    }
+  }
+
   /// Whether the result is a function name.
   bool isFunction = false;
   bool isInitializer = false;

lib/Frontend/ModuleInterfaceLoader.cpp

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

test/Interop/Cxx/enum/Inputs/CFAvailability.h

@@ -10,13 +10,9 @@
 #endif
 
 #if (__cplusplus)
-#define CF_OPTIONS(_type, _name)                                               \
-  _type __attribute__((availability(swift, unavailable))) _name;               \
-  enum __CF_OPTIONS_ATTRIBUTES : _name
+#define CF_OPTIONS(_type, _name) __attribute__((availability(swift,unavailable))) _type _name; enum __CF_OPTIONS_ATTRIBUTES : _name
 #else
-#define CF_OPTIONS(_type, _name)                                               \
-  enum __CF_OPTIONS_ATTRIBUTES _name : _type _name;                            \
-  enum _name : _type
+#define CF_OPTIONS(_type, _name) enum __CF_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
 #endif
 
 #define NS_OPTIONS(_type, _name) CF_OPTIONS(_type, _name)

test/Interop/Cxx/enum/anonymous-with-swift-name-module-interface.swift

@@ -27,8 +27,7 @@
 // CHECK:   static var All: SOColorMask { get }
 // CHECK: }
 
-// CHECK: @available(*, unavailable, message: "Not available in Swift")
-// CHECK: typealias CFColorMask = UInt32
+// CHECK-NOT: typealias CFColorMask = UInt32
 
 // CHECK: struct CFColorMask : OptionSet {
 // CHECK:   init(rawValue: UInt32)

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-NS_REFINED_FOR_SWIFT.swift

@@ -3,8 +3,9 @@
 
 import CenumsNSOptions
 
-// CHECK:      typealias NSAttributedStringFormattingOptions = UInt
-// CHECK-NEXT: struct __NSAttributedStringFormattingOptions : OptionSet, @unchecked Sendable {
+// CHECK-NOT: typealias NSAttributedStringFormattingOptions = UInt
+
+// CHECK: struct __NSAttributedStringFormattingOptions : OptionSet, @unchecked Sendable {
 // CHECK-NEXT:   init(rawValue: UInt)
 // CHECK-NEXT:   let rawValue: UInt
 // CHECK-NEXT:   typealias RawValue = UInt

test/Interop/Cxx/enum/c-enums-NS_OPTIONS.swift

@@ -3,8 +3,9 @@
 
 import CenumsNSOptions
 
-// CHECK: typealias NSBinarySearchingOptions = UInt
-// CHECK-NEXT: struct NSBinarySearchingOptions : OptionSet, @unchecked Sendable {
+// CHECK-NOT: typealias NSBinarySearchingOptions = UInt
+
+// CHECK: struct NSBinarySearchingOptions : OptionSet, @unchecked Sendable {
 // CHECK-NEXT:   init(rawValue: UInt)
 // CHECK-NEXT:   let rawValue: UInt
 // CHECK-NEXT:   typealias RawValue = UInt