[Import as member] Turn on CoreGraphics.

Introduces CoreGraphics.apinotes, in which we enable the
import-as-member inference system. Additionally, include some explicit
SwiftNames, for when inference doesn't produce the right result, and
to aid compatibility with the overlays.

Refactors many of the trivial overlays out, shrinking the
CoreGraphics.swift overlay by over half. Updates in-tree test
cases. The names we currently have will be highly in flux for a while,
and are likely to change frequently over the near term.

There are a few remaining known bugs that are worked around by
apinotes entries.

Author: milseman

CMakeLists.txt

@@ -683,7 +683,11 @@ endif()
 #
 # Set up global CMake variables for API notes.
 #
-
+# API notes version 1.0.0
+#
+# Change the above comment to 'touch' this file and keep incremental builds
+# working when adding a new apinotes file.
+#
 set(SWIFT_API_NOTES_PATH "${SWIFT_SOURCE_DIR}/apinotes")
 if(NOT EXISTS "${SWIFT_API_NOTES_PATH}/Foundation.apinotes")
   message(FATAL_ERROR "API notes are not available in ${SWIFT_API_NOTES_PATH}")

apinotes/CoreGraphics.apinotes

@@ -0,0 +1,65 @@
+---
+Name: CoreGraphics
+SwiftInferImportAsMember: true
+# The below are inline functions that are irrelevant due to memberwise inits
+Functions:
+- Name: CGPointMake
+  Availability: nonswift
+- Name: CGSizeMake
+  Availability: nonswift
+- Name: CGVectorMake
+  Availability: nonswift
+- Name: CGRectMake
+  Availability: nonswift
+- Name: CGAffineTransformMake
+  Availability: nonswift
+# The below are fixups that inference didn't quite do what we wanted, and are 
+# pulled over from what used to be in the overlays
+- Name: CGRectIsNull
+  SwiftName: "getter:CGRect.isNull(self:)"
+- Name: CGRectIsEmpty
+  SwiftName: "getter:CGRect.isEmpty(self:)"
+- Name: CGRectIsInfinite
+  SwiftName: "getter:CGRect.isInfinite(self:)"
+- Name: CGRectStandardize
+  SwiftName: "getter:CGRect.standardized(self:)"
+- Name: CGRectIntegral
+  SwiftName: "getter:CGRect.integral(self:)"
+- Name: CGRectInset
+  SwiftName: "CGRect.insetBy(self:dx:dy:)"
+- Name: CGRectOffset
+  SwiftName: "CGRect.offsetBy(self:dx:dy:)"
+- Name: CGRectUnion
+  SwiftName: "CGRect.union(self:_:)"
+- Name: CGRectIntersection
+  SwiftName: "CGRect.intersect(self:_:)"
+- Name: CGRectContainsRect
+  SwiftName: "CGRect.contains(self:_:)"
+- Name: CGRectContainsPoint
+  SwiftName: "CGRect.contains(self:_:)"
+- Name: CGRectIntersectsRect
+  SwiftName: "CGRect.intersects(self:_:)"
+# The below are left alone, due to an unknown bug
+# FIXME: fix me
+- Name: CGColorSpaceCreateDeviceRGB
+  SwiftName: "CGColorSpaceCreateDeviceRGB()"
+
+# The below are globals that are defined as opaque C constants for no good
+# reason.
+Globals:
+- Name: CGPointZero
+  Availability: nonswift
+- Name: CGSizeZero
+  Availability: nonswift
+- Name: CGVectorZero
+  Availability: nonswift
+- Name: CGRectZero
+  Availability: nonswift
+- Name: CGAffineTransformIdentity
+  Availability: nonswift
+# The below are left alone, due to an unknown bug
+# FIXME: fix me
+- Name: kCGColorBlack
+  SwiftName: "kCGColorBlack"
+- Name: kCGColorWhite
+  SwiftName: "kCGColorWhite"

lib/ClangImporter/SwiftLookupTable.h

@@ -146,7 +146,7 @@ const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MAJOR = 1;
 /// Lookup table minor version number.
 ///
 /// When the format changes IN ANY WAY, this number should be incremented.
-const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MINOR = 11; // globals-as-members
+const uint16_t SWIFT_LOOKUP_TABLE_VERSION_MINOR = 12; // CG import-as-member
 
 /// A lookup table that maps Swift names to the set of Clang
 /// declarations with that particular name.

stdlib/public/SDK/CoreGraphics/CoreGraphics.swift

@@ -130,14 +130,6 @@ public extension CGRect {
     @_transparent // @fragile
     get { return CGRect(x: 0, y: 0, width: 0, height: 0) }
   }
-  static var null: CGRect {
-    @_transparent // @fragile
-    get { return CGRectNull }
-  }
-  static var infinite: CGRect {
-    @_transparent // @fragile
-    get { return CGRectInfinite }
-  }
 
   @_transparent // @fragile
   init(x: CGFloat, y: CGFloat, width: CGFloat, height: CGFloat) {
@@ -157,61 +149,6 @@ public extension CGRect {
               size: CGSize(width: width, height: height))
   }
 
-  var width:  CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetWidth(self) }
-  }
-  var height: CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetHeight(self) }
-  }
-
-  var minX:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMinX(self) }
-  }
-  var midX:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMidX(self) }
-  }
-  var maxX:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMaxX(self) }
-  }
-  var minY:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMinY(self) }
-  }
-  var midY:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMidY(self) }
-  }
-  var maxY:   CGFloat {
-    @_transparent // @fragile
-    get { return CGRectGetMaxY(self) }
-  }
-  var isNull:     Bool {
-    @_transparent // @fragile
-    get { return CGRectIsNull(self) }
-  }
-  var isEmpty:    Bool {
-    @_transparent // @fragile
-    get { return CGRectIsEmpty(self) }
-  }
-  var isInfinite: Bool {
-    @_transparent // @fragile
-    get { return CGRectIsInfinite(self) }
-  }
-  var standardized: CGRect {
-    @_transparent // @fragile
-    get { return CGRectStandardize(self) }
-  }
-
-  var integral: CGRect {
-    @_transparent // @fragile
-    get { return CGRectIntegral(self) }
-  }
-
   @_transparent // @fragile
   mutating func standardizeInPlace() {
     self = standardized
@@ -222,45 +159,21 @@ public extension CGRect {
     self = integral
   }
 
-  @_transparent // @fragile
-  @warn_unused_result(mutable_variant: "insetInPlace")
-  func insetBy(dx dx: CGFloat, dy: CGFloat) -> CGRect {
-    return CGRectInset(self, dx, dy)
-  }
-
   @_transparent // @fragile
   mutating func insetInPlace(dx dx: CGFloat, dy: CGFloat) {
     self = insetBy(dx: dx, dy: dy)
   }
 
-  @_transparent // @fragile
-  @warn_unused_result(mutable_variant: "offsetInPlace")
-  func offsetBy(dx dx: CGFloat, dy: CGFloat) -> CGRect {
-    return CGRectOffset(self, dx, dy)
-  }
-
   @_transparent // @fragile
   mutating func offsetInPlace(dx dx: CGFloat, dy: CGFloat) {
     self = offsetBy(dx: dx, dy: dy)
   }
 
-  @_transparent // @fragile
-  @warn_unused_result(mutable_variant: "unionInPlace")
-  func union(rect: CGRect) -> CGRect {
-    return CGRectUnion(self, rect)
-  }
-
   @_transparent // @fragile
   mutating func unionInPlace(rect: CGRect) {
     self = union(rect)
   }
 
-  @_transparent // @fragile
-  @warn_unused_result(mutable_variant: "intersectInPlace")
-  func intersect(rect: CGRect) -> CGRect {
-    return CGRectIntersection(self, rect)
-  }
-
   @_transparent // @fragile
   mutating func intersectInPlace(rect: CGRect) {
     self = intersect(rect)
@@ -273,27 +186,10 @@ public extension CGRect {
   {
     var slice = CGRect.zero
     var remainder = CGRect.zero
-    CGRectDivide(self, &slice, &remainder, atDistance, fromEdge)
+    divide(slice: &slice, remainder: &remainder, amount: atDistance,
+           edge: fromEdge)
     return (slice, remainder)
   }
-
-  @_transparent // @fragile
-  @warn_unused_result
-  func contains(rect: CGRect) -> Bool {
-    return CGRectContainsRect(self, rect)
-  }
-
-  @_transparent // @fragile
-  @warn_unused_result
-  func contains(point: CGPoint) -> Bool {
-    return CGRectContainsPoint(self, point)
-  }
-
-  @_transparent // @fragile
-  @warn_unused_result
-  func intersects(rect: CGRect) -> Bool {
-    return CGRectIntersectsRect(self, rect)
-  }
 }
 
 extension CGRect : CustomReflectable, CustomPlaygroundQuickLookable {
@@ -321,28 +217,13 @@ extension CGRect : Equatable {}
 @_transparent // @fragile
 @warn_unused_result
 public func == (lhs: CGRect, rhs: CGRect) -> Bool {
-  return CGRectEqualToRect(lhs, rhs)
-}
-
-// Overlay the C names of these constants with transparent definitions. The
-// C constants are opaque extern globals for no good reason.
-
-public var CGPointZero: CGPoint {
-  @_transparent // @fragile
-  get { return CGPoint.zero }
-}
-
-public var CGRectZero: CGRect {
-  @_transparent // @fragile
-  get { return CGRect.zero }
+  return lhs.equalToRect(rect2: rhs)
 }
 
-public var CGSizeZero: CGSize {
-  @_transparent // @fragile
-  get { return CGSize.zero }
+extension CGAffineTransform {
+  public static var identity: CGAffineTransform {
+   @_transparent // @fragile
+   get { return CGAffineTransform(a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0) }
+ }
 }
 
-public var CGAffineTransformIdentity: CGAffineTransform {
-  @_transparent // @fragile
-  get { return CGAffineTransform(a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0) }
-}

test/Interpreter/SDK/CALayer.swift

@@ -22,10 +22,10 @@ func hangCanary(o: AnyObject) {
 
 class FooLayer: CALayer {
   var black: CGColor
-  var white: CGColor = CGColorGetConstantColor(kCGColorWhite)!
+  var white: CGColor = CGColor.getConstantColor(colorName: kCGColorWhite)!
 
   override init() {
-    black = CGColorGetConstantColor(kCGColorBlack)!
+    black = CGColor.getConstantColor(colorName: kCGColorBlack)!
     super.init()
     hangCanary(self)
   }

test/Interpreter/SDK/c_pointers.swift

@@ -23,7 +23,7 @@ typealias XXColor = UIColor
 //
 
 let rgb = CGColorSpaceCreateDeviceRGB()
-let cgRed = CGColorCreate(rgb, [1.0, 0.0, 0.0, 1.0])!
+let cgRed = CGColor(space: rgb, components: [1.0, 0.0, 0.0, 1.0])!
 
 let nsRed = XXColor(cgColor: cgRed)
 

test/Interpreter/SDK/cf_extensions.swift

@@ -22,12 +22,12 @@ extension CGColorSpace {
 extension CGColor {
   class func create(colorSpace colorSpace: CGColorSpace, components: [CGFloat])
       -> CGColor {
-    return CGColorCreate(colorSpace, components)!
+    return CGColor(space: colorSpace, components: components)!
   }
 
-  var r: CGFloat { return CGColorGetComponents(self)[0] }
-  var g: CGFloat { return CGColorGetComponents(self)[1] }
-  var b: CGFloat { return CGColorGetComponents(self)[2] }
+  var r: CGFloat { return components[0] }
+  var g: CGFloat { return components[1] }
+  var b: CGFloat { return components[2] }
 }
 
 let pink = CGColor.create(colorSpace: .deviceRGB(),

test/Interpreter/SDK/cf_type_bridging.swift

@@ -10,7 +10,8 @@ import AppKit
 import UIKit
 #endif
 
-let foo: [CGColor] = [CGColorCreate(CGColorSpaceCreateDeviceRGB(), [1.0, 0.0, 0.0, 1.0])!]
+let foo: [CGColor] = [CGColor(space: CGColorSpaceCreateDeviceRGB(),
+	                            components: [1.0, 0.0, 0.0, 1.0])!]
 
 let bar = foo as NSArray