Merge pull request #37416 from allevato/cgfloat_is_a_bridge_too_far

[PrintAsObjc] Import/fwd-declare the unbridged type for known types.

Author: allevato

lib/PrintAsObjC/DeclAndTypePrinter.cpp

@@ -1183,7 +1183,7 @@ class DeclAndTypePrinter::Implementation
             copyTy->isDictionary() ||
             copyTy->isSet() ||
             copyTy->isString() ||
-            (!getKnownTypeInfo(nominal) && getObjCBridgedClass(nominal))) {
+            getObjCBridgedClass(nominal)) {
           // We fast-path the most common cases in the condition above.
           os << ", copy";
         } else if (copyTy->isUnmanaged()) {
@@ -1371,10 +1371,15 @@ class DeclAndTypePrinter::Implementation
 
 public:
   /// If \p nominal is bridged to an Objective-C class (via a conformance to
-  /// _ObjectiveCBridgeable), return that class.
+  /// _ObjectiveCBridgeable) and is not an imported Clang type or a known type,
+  /// return that class.
   ///
   /// Otherwise returns null.
   const ClassDecl *getObjCBridgedClass(const NominalTypeDecl *nominal) {
+    // Print known types as their unbridged type.
+    if (getKnownTypeInfo(nominal))
+      return nullptr;
+
     // Print imported bridgeable decls as their unbridged type.
     if (nominal->hasClangNode())
       return nullptr;

test/PrintAsObjC/bridged-known-types.swift

@@ -0,0 +1,29 @@
+// Test that known types that conform to `_ObjectiveCBridgeable` import or
+// forward-declare based on the Clang type in their known type mapping, not
+// their bridged type.
+//
+// This is particularly important for `CGFloat`, which has a native Swift decl
+// in the CoreGraphics overlay that shadows the imported Clang decl, so relying
+// solely on whether or not the decl has a Clang node is not sufficient.
+
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -typecheck %s -parse-as-library -emit-objc-header-path %t/swift.h
+// RUN: %FileCheck %s < %t/swift.h
+
+// REQUIRES: objc_interop
+
+import CoreGraphics
+import Foundation
+
+// CHECK: @import CoreGraphics;
+
+// CHECK-NOT: @class NSNumber;
+
+// CHECK-LABEL: @interface Test : NSObject{{$}}
+public class Test: NSObject {
+  // CHECK-NEXT: - (CGFloat)level
+  @objc public func level() -> CGFloat { 9000.0 }
+  // CHECK-NEXT: - (BOOL)isEnabled
+  @objc public func isEnabled() -> Bool { true }
+  // CHECK-NEXT: init
+} // CHECK-NEXT: @end