Merge pull request #41197 from salinas-miguel/import-CGFloat-APIs-correctly

Import CGFloat APIs correctly

Author: salinas-miguel

lib/AST/ASTContext.cpp

@@ -4880,6 +4880,10 @@ ASTContext::getForeignRepresentationInfo(NominalTypeDecl *nominal,
       addTrivial(Id_CGFloat, coreGraphics);
     }
 
+    if (auto coreFoundation = getLoadedModule(getIdentifier("CoreFoundation"))) {
+      addTrivial(Id_CGFloat, coreFoundation);
+    }
+
     // Pull SIMD types of size 2...4 from the SIMD module, if it exists.
     // FIXME: Layering violation to use the ClangImporter's define.
     const unsigned SWIFT_MAX_IMPORTED_SIMD_ELEMENTS = 4;
@@ -4928,6 +4932,7 @@ ASTContext::getForeignRepresentationInfo(NominalTypeDecl *nominal,
   conditionallyAddTrivial(nominal, getIdentifier("ObjCBool"), Id_ObjectiveC);
   conditionallyAddTrivial(nominal, getSwiftId(KnownFoundationEntity::NSZone), Id_ObjectiveC, true);
   conditionallyAddTrivial(nominal, Id_CGFloat, getIdentifier("CoreGraphics"));
+  conditionallyAddTrivial(nominal, Id_CGFloat, getIdentifier("CoreFoundation"));
   const unsigned SWIFT_MAX_IMPORTED_SIMD_ELEMENTS = 4;
 #define MAP_SIMD_TYPE(BASENAME, _, __)                                         \
   {                                                                            \

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -1474,8 +1474,10 @@ class DeclAndTypePrinter::Implementation
       specialNames[{ctx.Id_Darwin, ctx.getIdentifier("DarwinBoolean")}]
         = { "Boolean", false};
 
-      Identifier ID_CoreGraphics = ctx.getIdentifier("CoreGraphics");
-      specialNames[{ID_CoreGraphics, ctx.getIdentifier("CGFloat")}]
+      specialNames[{ctx.Id_CoreGraphics, ctx.Id_CGFloat}]
+        = { "CGFloat", false };
+
+      specialNames[{ctx.Id_CoreFoundation, ctx.Id_CGFloat}]
         = { "CGFloat", false };
 
       // Use typedefs we set up for SIMD vector types.

test/ClangImporter/import-cgfloat-api.swift

@@ -0,0 +1,19 @@
+// RUN: %empty-directory(%t)
+// RUN: mkdir -p %t/modules
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t/modules) -Xcc -DCGFLOAT_IN_COREFOUNDATION -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t/modules/CoreFoundation.swiftmodule %clang-importer-sdk-path/swift-modules/CoreFoundation.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t/modules) -Xcc -DCGFLOAT_IN_COREFOUNDATION -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t/modules/CoreGraphics.swiftmodule %clang-importer-sdk-path/swift-modules/CoreGraphics.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t/modules) -Xcc -DCGFLOAT_IN_COREFOUNDATION -DCGFLOAT_IN_COREFOUNDATION -emit-module -o %t/modules/Foundation.swiftmodule %clang-importer-sdk-path/swift-modules/Foundation.swift
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource -I %t/modules) -typecheck -Xcc -DCGFLOAT_IN_COREFOUNDATION -DCGFLOAT_IN_COREFOUNDATION %s
+
+// REQUIRES: objc_interop
+
+import CoreFoundation
+import Foundation
+import CoreGraphics
+
+func test() -> UnsafeMutablePointer<CGFloat>? {
+    let color = CGColor(gray: 1.0, alpha: 1.0)
+    return CGColorGetComponents(color)
+}
+

test/Inputs/clang-importer-sdk/usr/include/CoreFoundation.h

@@ -40,4 +40,41 @@ extern CFIndex CFIndex_test;
 
 #define CF_NOESCAPE __attribute__((noescape))
 
+#ifdef CGFLOAT_IN_COREFOUNDATION
+#if defined(__LP64__) && __LP64__
+# define CGFLOAT_TYPE double
+# define CGFLOAT_IS_DOUBLE 1
+# define CGFLOAT_MIN DBL_MIN
+# define CGFLOAT_MAX DBL_MAX
+#else
+# define CGFLOAT_TYPE float
+# define CGFLOAT_IS_DOUBLE 0
+# define CGFLOAT_MIN FLT_MIN
+# define CGFLOAT_MAX FLT_MAX
+#endif
+
+typedef CGFLOAT_TYPE CGFloat;
+#define CGFLOAT_DEFINED 1
+
+struct CGPoint {
+  CGFloat x;
+  CGFloat y;
+};
+typedef struct CGPoint CGPoint;
+
+struct CGSize {
+  CGFloat width;
+  CGFloat height;
+};
+typedef struct CGSize CGSize;
+
+struct CGRect {
+  CGPoint origin;
+  CGSize size;
+};
+typedef struct CGRect CGRect;
+
+typedef CGRect CGRectTy;
+#endif //CGFLOAT_IN_COREFOUNDATION
+
 #endif

test/Inputs/clang-importer-sdk/usr/include/CoreGraphics.h

@@ -1,3 +1,4 @@
+#ifndef CGFLOAT_IN_COREFOUNDATION
 #if defined(__LP64__) && __LP64__
 # define CGFLOAT_TYPE double
 # define CGFLOAT_IS_DOUBLE 1
@@ -32,7 +33,12 @@ struct CGRect {
 typedef struct CGRect CGRect;
 
 typedef CGRect CGRectTy;
+#else
+#import "CoreFoundation.h"
+#endif //CGFLOAT_IN_COREFOUNDATION
 
 typedef struct CGColor *CGColorRef;
 
 CGColorRef CGColorCreateGenericGray(CGFloat gray, CGFloat alpha);
+
+CGFloat *CGColorGetComponents(CGColorRef color);