refactor and add test

Author: salinas-miguel

lib/ClangImporter/ImportDecl.cpp

@@ -250,29 +250,6 @@ getSwiftStdlibType(const clang::TypedefNameDecl *D,
     }
 #include "MappedTypes.def"
 
-    if (Name.str() == "CGFloat") {
-      SwiftModuleName = "CoreGraphics";
- 
-      ModuleDecl *M = Impl.getNamedModule("CoreFoundation");
-      if (M) {
-        Type SwiftType = Impl.getNamedSwiftType(M, "CGFloat");
-        if (SwiftType) {
-          SwiftModuleName = "CoreFoundation";
-        }
-      }
- 
-      CTypeKind = MappedCTypeKind::CGFloat;
-      Bitwidth = 0;
-      IsSwiftModule = false;
-      SwiftTypeName = "CGFloat";
-      CanBeMissing = false;
-      NameMapping = MappedTypeNameKind::DoNothing;
-      assert(verifyNameMapping(MappedTypeNameKind::DoNothing,
-                              "CGFloat", "CGFloat") &&
-            "MappedTypes.def: Identical names must use DoNothing");
-      break;
-    }
-
     // We handle `BOOL` as a special case because the selection here is more
     // complicated as the type alias exists on multiple platforms as different
     // types.  It appears in an Objective-C context where it is a `signed char`
@@ -460,16 +437,20 @@ getSwiftStdlibType(const clang::TypedefNameDecl *D,
     M = Impl.getStdlibModule();
   else
     M = Impl.getNamedModule(SwiftModuleName);
-  if (!M) {
-    // User did not import the library module that contains the type we want to
-    // substitute.
-    *IsError = true;
-    return std::make_pair(Type(), "");
-  }
 
   Type SwiftType = Impl.getNamedSwiftType(M, SwiftTypeName);
+
+  if (!SwiftType && CTypeKind == MappedCTypeKind::CGFloat) {
+    // Fall back to looking for CGFloat in Core Graphics.
+    M = Impl.getNamedModule("CoreGraphics");
+    SwiftType = Impl.getNamedSwiftType(M, SwiftTypeName);
+  }
+
   if (!SwiftType && !CanBeMissing) {
     // The required type is not defined in the standard library.
+    // The required type is not defined in the library, or the user has not
+    // imported the library that defines it (so `M` was null and
+    // `getNamedSwiftType()` returned early).
     *IsError = true;
     return std::make_pair(Type(), "");
   }

lib/ClangImporter/MappedTypes.def

@@ -155,6 +155,9 @@ MAP_STDLIB_TYPE(
   Impl.SwiftContext.getSwiftName(KnownFoundationEntity::NSUInteger),
   UnsignedWord, 0, "Int", false, DoNothing)
 
+// CGFloat.
+MAP_TYPE("CGFloat", CGFloat, 0, "CoreFoundation", "CGFloat", false, DoNothing)
+
 // CoreFoundation types.
 // Note that we're preserving the typealias for CFIndex.
 MAP_STDLIB_TYPE("CFTypeID", UnsignedWord, 0, "UInt", false, DefineAndUse)

test/Inputs/clang-importer-sdk/swift-modules/CoreFoundation.swift

@@ -1,3 +1,51 @@
 @_exported import CoreFoundation
 
 protocol _CFObject: Hashable {}
+
+#if CGFLOAT_IN_COREFOUNDATION
+public struct CGFloat {
+#if arch(i386) || arch(arm) || arch(arm64_32)
+  public typealias UnderlyingType = Float
+#elseif arch(x86_64) || arch(arm64) || arch(powerpc64le) || arch(s390x)
+  public typealias UnderlyingType = Double
+#endif
+
+  public init() { 
+    self.value = 0.0
+  }
+
+  public init(_ value: Int) { 
+    self.value = UnderlyingType(value)
+  }
+
+  public init(_ value: Float) { 
+    self.value = UnderlyingType(value)
+  }
+
+  public init(_ value: Double) { 
+    self.value = UnderlyingType(value)
+  }
+
+  var value: UnderlyingType
+}
+
+public func ==(lhs: CGFloat, rhs: CGFloat) -> Bool {
+  return lhs.value == rhs.value
+}
+
+extension CGFloat : ExpressibleByIntegerLiteral, ExpressibleByFloatLiteral, Equatable {
+  public init(integerLiteral value: UnderlyingType) {
+    self.value = value
+  }
+
+  public init(floatLiteral value: UnderlyingType) {
+    self.value = value
+  }
+}
+
+public extension Double {
+  init(_ value: CGFloat) {
+    self = Double(value.value)
+  }
+}
+#endif

test/Inputs/clang-importer-sdk/swift-modules/CoreGraphics.swift

@@ -5,6 +5,7 @@ public func == (lhs: CGPoint, rhs: CGPoint) -> Bool {
   return lhs.x == rhs.x  &&  lhs.y == rhs.y
 }
 
+#if !CGFLOAT_IN_COREFOUNDATION
 public struct CGFloat {
 #if arch(i386) || arch(arm) || arch(arm64_32)
   public typealias UnderlyingType = Float
@@ -50,3 +51,4 @@ public extension Double {
     self = Double(value.value)
   }
 }
+#endif

test/PrintAsObjC/bridged-known-types-cf-cgfloat.swift

@@ -0,0 +1,32 @@
+// 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
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreFoundation.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/Foundation.swift
+
+// 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

test/PrintAsObjC/bridged-known-types.swift

@@ -9,6 +9,9 @@
 // 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
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreFoundation.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -o %t %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t) -emit-module -o %t %clang-importer-sdk-path/swift-modules/Foundation.swift
 
 // REQUIRES: objc_interop