Apply annotations to further non-trivial types

Itai Ferber · Itai Ferber · commit 9f042bc7c345 · 2018-09-11T14:38:53.000-07:00
diff --git a/stdlib/public/SDK/Foundation/Calendar.swift b/stdlib/public/SDK/Foundation/Calendar.swift
@@ -97,7 +97,7 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
     /// Returns a new Calendar.
     ///
     /// - parameter identifier: The kind of calendar to use.
-    public init(identifier: Identifier) {
+    public init(identifier: __shared Identifier) {
         let result = __NSCalendarCreate(Calendar._toNSCalendarIdentifier(identifier))
         _handle = _MutableHandle(adoptingReference: result as! NSCalendar)
         _autoupdating = false
diff --git a/stdlib/public/SDK/Foundation/CharacterSet.swift b/stdlib/public/SDK/Foundation/CharacterSet.swift
@@ -390,23 +390,23 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
     /// Initialize with the characters in the given string.
     ///
     /// - parameter string: The string content to inspect for characters.
-    public init(charactersIn string: String) {
+    public init(charactersIn string: __shared String) {
         _storage = _CharacterSetStorage(immutableReference: CFCharacterSetCreateWithCharactersInString(nil, string as CFString))
     }
     
     /// Initialize with a bitmap representation.
     ///
     /// This method is useful for creating a character set object with data from a file or other external data source.
     /// - parameter data: The bitmap representation.
-    public init(bitmapRepresentation data: Data) {
+    public init(bitmapRepresentation data: __shared Data) {
         _storage = _CharacterSetStorage(immutableReference: CFCharacterSetCreateWithBitmapRepresentation(nil, data as CFData))
     }
     
     /// Initialize with the contents of a file.
     ///
     /// Returns `nil` if there was an error reading the file.
     /// - parameter file: The file to read.
-    public init?(contentsOfFile file: String) {
+    public init?(contentsOfFile file: __shared String) {
         do {
             let data = try Data(contentsOf: URL(fileURLWithPath: file), options: .mappedIfSafe)
             _storage = _CharacterSetStorage(immutableReference: CFCharacterSetCreateWithBitmapRepresentation(nil, data as CFData))
@@ -427,7 +427,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
         _storage = _uncopiedStorage
     }
 
-    fileprivate init(_builtIn: CFCharacterSetPredefinedSet) {
+    fileprivate init(_builtIn: __shared CFCharacterSetPredefinedSet) {
         _storage = _CharacterSetStorage(immutableReference: CFCharacterSetGetPredefined(_builtIn))
     }
     
diff --git a/stdlib/public/SDK/Foundation/Data.swift b/stdlib/public/SDK/Foundation/Data.swift
@@ -1178,7 +1178,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     /// - parameter url: The `URL` to read.
     /// - parameter options: Options for the read operation. Default value is `[]`.
     /// - throws: An error in the Cocoa domain, if `url` cannot be read.
-    public init(contentsOf url: URL, options: Data.ReadingOptions = []) throws {
+    public init(contentsOf url: __shared URL, options: __shared Data.ReadingOptions = []) throws {
         let d = try NSData(contentsOf: url, options: ReadingOptions(rawValue: options.rawValue))
         _backing = _DataStorage(immutableReference: d, offset: 0)
         _sliceRange = 0..<d.length
@@ -1189,7 +1189,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     /// Returns nil when the input is not recognized as valid Base-64.
     /// - parameter base64String: The string to parse.
     /// - parameter options: Encoding options. Default value is `[]`.
-    public init?(base64Encoded base64String: String, options: Data.Base64DecodingOptions = []) {
+    public init?(base64Encoded base64String: __shared String, options: __shared Data.Base64DecodingOptions = []) {
         if let d = NSData(base64Encoded: base64String, options: Base64DecodingOptions(rawValue: options.rawValue)) {
             _backing = _DataStorage(immutableReference: d, offset: 0)
             _sliceRange = 0..<d.length
@@ -1204,7 +1204,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     ///
     /// - parameter base64Data: Base-64, UTF-8 encoded input data.
     /// - parameter options: Decoding options. Default value is `[]`.
-    public init?(base64Encoded base64Data: Data, options: Data.Base64DecodingOptions = []) {
+    public init?(base64Encoded base64Data: __shared Data, options: __shared Data.Base64DecodingOptions = []) {
         if let d = NSData(base64Encoded: base64Data, options: Base64DecodingOptions(rawValue: options.rawValue)) {
             _backing = _DataStorage(immutableReference: d, offset: 0)
             _sliceRange = 0..<d.length
diff --git a/stdlib/public/SDK/Foundation/Decimal.swift b/stdlib/public/SDK/Foundation/Decimal.swift
@@ -452,7 +452,7 @@ extension Decimal {
 }
 
 extension Decimal : CustomStringConvertible {
-    public init?(string: String, locale: Locale? = nil) {
+    public init?(string: __shared String, locale: __shared Locale? = nil) {
         let scan = Scanner(string: string)
         var theDecimal = Decimal()
         scan.locale = locale
diff --git a/stdlib/public/SDK/Foundation/IndexPath.swift b/stdlib/public/SDK/Foundation/IndexPath.swift
@@ -156,7 +156,7 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl
             }
         }
         
-        mutating func append(contentsOf other: [Int]) {
+        mutating func append(contentsOf other: __owned [Int]) {
             switch self {
             case .empty:
                 switch other.count {
diff --git a/stdlib/public/SDK/Foundation/NSError.swift b/stdlib/public/SDK/Foundation/NSError.swift
@@ -359,7 +359,7 @@ extension CFError : Error {
 public protocol _ObjectiveCBridgeableError : Error {
   /// Produce a value of the error type corresponding to the given NSError,
   /// or return nil if it cannot be bridged.
-  init?(_bridgedNSError: NSError)
+  init?(_bridgedNSError: __shared NSError)
 }
 
 /// A hook for the runtime to use _ObjectiveCBridgeableError in order to
diff --git a/stdlib/public/SDK/Foundation/NSExpression.swift b/stdlib/public/SDK/Foundation/NSExpression.swift
@@ -15,7 +15,7 @@
 extension NSExpression {
   // + (NSExpression *) expressionWithFormat:(NSString *)expressionFormat, ...;
   public
-  convenience init(format expressionFormat: String, _ args: CVarArg...) {
+  convenience init(format expressionFormat: __shared String, _ args: CVarArg...) {
     let va_args = getVaList(args)
     self.init(format: expressionFormat, arguments: va_args)
   }
diff --git a/stdlib/public/SDK/Foundation/NSObject.swift b/stdlib/public/SDK/Foundation/NSObject.swift
@@ -81,7 +81,7 @@ fileprivate extension NSObject {
     
     @nonobjc static var keyPathTableLock = NSLock()
     
-    @nonobjc fileprivate static func _bridgeKeyPath(_ keyPath:AnyKeyPath) -> String {
+    @nonobjc fileprivate static func _bridgeKeyPath(_ keyPath: __owned AnyKeyPath) -> String {
         guard let keyPathString = keyPath._kvcKeyPathString else { fatalError("Could not extract a String from KeyPath \(keyPath)") }
         _KVOKeyPathBridgeMachinery.keyPathTableLock.lock()
         defer { _KVOKeyPathBridgeMachinery.keyPathTableLock.unlock() }
@@ -199,27 +199,27 @@ public extension _KeyValueCodingAndObserving {
         return result
     }
     
-    public func willChangeValue<Value>(for keyPath: KeyPath<Self, Value>) {
+    public func willChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>) {
         (self as! NSObject).willChangeValue(forKey: _bridgeKeyPathToString(keyPath))
     }
     
-    public func willChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: KeyPath<Self, Value>) {
+    public func willChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: __owned KeyPath<Self, Value>) {
         (self as! NSObject).willChange(changeKind, valuesAt: indexes, forKey: _bridgeKeyPathToString(keyPath))
     }
     
-    public func willChangeValue<Value>(for keyPath: KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {
+    public func willChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {
         (self as! NSObject).willChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)
     }
     
-    public func didChangeValue<Value>(for keyPath: KeyPath<Self, Value>) {
+    public func didChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>) {
         (self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath))
     }
     
-    public func didChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: KeyPath<Self, Value>) {
+    public func didChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: __owned KeyPath<Self, Value>) {
         (self as! NSObject).didChange(changeKind, valuesAt: indexes, forKey: _bridgeKeyPathToString(keyPath))
     }
     
-    public func didChangeValue<Value>(for keyPath: KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {
+    public func didChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {
         (self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)
     }
 }
diff --git a/stdlib/public/SDK/Foundation/NSPredicate.swift b/stdlib/public/SDK/Foundation/NSPredicate.swift
@@ -15,7 +15,7 @@
 extension NSPredicate {
   // + (NSPredicate *)predicateWithFormat:(NSString *)predicateFormat, ...;
   public
-  convenience init(format predicateFormat: String, _ args: CVarArg...) {
+  convenience init(format predicateFormat: __shared String, _ args: CVarArg...) {
     let va_args = getVaList(args)
     self.init(format: predicateFormat, arguments: va_args)
   }
diff --git a/stdlib/public/SDK/Foundation/NSRange.swift b/stdlib/public/SDK/Foundation/NSRange.swift
@@ -37,7 +37,7 @@ extension NSRange : CustomStringConvertible, CustomDebugStringConvertible {
 }
 
 extension NSRange {
-    public init?(_ string: String) {
+    public init?(_ string: __shared String) {
         var savedLocation = 0
         if string.isEmpty {
             // fail early if the string is empty
@@ -178,7 +178,7 @@ extension Range where Bound == Int {
 }
 
 extension Range where Bound == String.Index {
-  public init?(_ range: NSRange, in string: String) {
+  public init?(_ range: NSRange, in string: __shared String) {
     let u = string.utf16
     guard range.location != NSNotFound,
       let start = u.index(u.startIndex, offsetBy: range.location, limitedBy: u.endIndex),
diff --git a/stdlib/public/SDK/Foundation/NSStringAPI.swift b/stdlib/public/SDK/Foundation/NSStringAPI.swift
@@ -187,7 +187,7 @@ extension String {
   /// - Parameters:
   ///   - bytes: A sequence of bytes to interpret using `encoding`.
   ///   - encoding: The ecoding to use to interpret `bytes`.
-  public init? <S: Sequence>(bytes: S, encoding: Encoding)
+  public init? <S: Sequence>(bytes: __shared S, encoding: Encoding)
     where S.Iterator.Element == UInt8 {
     let byteArray = Array(bytes)
     if let ns = NSString(
@@ -267,7 +267,7 @@ extension String {
   /// Produces a string created by reading data from the file at a
   /// given path interpreted using a given encoding.
   public init(
-    contentsOfFile path: String,
+    contentsOfFile path: __shared String,
     encoding enc: Encoding
   ) throws {
     let ns = try NSString(contentsOfFile: path, encoding: enc.rawValue)
@@ -283,7 +283,7 @@ extension String {
   /// a given path and returns by reference the encoding used to
   /// interpret the file.
   public init(
-    contentsOfFile path: String,
+    contentsOfFile path: __shared String,
     usedEncoding: inout Encoding
   ) throws {
     var enc: UInt = 0
@@ -293,7 +293,7 @@ extension String {
   }
 
   public init(
-    contentsOfFile path: String
+    contentsOfFile path: __shared String
   ) throws {
     let ns = try NSString(contentsOfFile: path, usedEncoding: nil)
     self = String._unconditionallyBridgeFromObjectiveC(ns)
@@ -308,7 +308,7 @@ extension String {
   /// interpreted using a given encoding.  Errors are written into the
   /// inout `error` argument.
   public init(
-    contentsOf url: URL,
+    contentsOf url: __shared URL,
     encoding enc: Encoding
   ) throws {
     let ns = try NSString(contentsOf: url, encoding: enc.rawValue)
@@ -324,7 +324,7 @@ extension String {
   /// and returns by reference the encoding used to interpret the
   /// data.  Errors are written into the inout `error` argument.
   public init(
-    contentsOf url: URL,
+    contentsOf url: __shared URL,
     usedEncoding: inout Encoding
   ) throws {
     var enc: UInt = 0
@@ -334,7 +334,7 @@ extension String {
   }
 
   public init(
-    contentsOf url: URL
+    contentsOf url: __shared URL
   ) throws {
     let ns = try NSString(contentsOf: url, usedEncoding: nil)
     self = String._unconditionallyBridgeFromObjectiveC(ns)
@@ -365,7 +365,7 @@ extension String {
 
   /// Returns a `String` initialized by converting given `data` into
   /// Unicode characters using a given `encoding`.
-  public init?(data: Data, encoding: Encoding) {
+  public init?(data: __shared Data, encoding: Encoding) {
     guard let s = NSString(data: data, encoding: encoding.rawValue) else { return nil }
     self = String._unconditionallyBridgeFromObjectiveC(s)
   }
@@ -375,7 +375,7 @@ extension String {
   /// Returns a `String` object initialized by using a given
   /// format string as a template into which the remaining argument
   /// values are substituted.
-  public init(format: String, _ arguments: CVarArg...) {
+  public init(format: __shared String, _ arguments: CVarArg...) {
     self = String(format: format, arguments: arguments)
   }
 
@@ -386,7 +386,7 @@ extension String {
   /// Returns a `String` object initialized by using a given
   /// format string as a template into which the remaining argument
   /// values are substituted according to the user's default locale.
-  public init(format: String, arguments: [CVarArg]) {
+  public init(format: __shared String, arguments: __shared [CVarArg]) {
     self = String(format: format, locale: nil, arguments: arguments)
   }
 
@@ -395,7 +395,7 @@ extension String {
   /// Returns a `String` object initialized by using a given
   /// format string as a template into which the remaining argument
   /// values are substituted according to given locale information.
-  public init(format: String, locale: Locale?, _ args: CVarArg...) {
+  public init(format: __shared String, locale: __shared Locale?, _ args: CVarArg...) {
     self = String(format: format, locale: locale, arguments: args)
   }
 
@@ -407,7 +407,7 @@ extension String {
   /// Returns a `String` object initialized by using a given
   /// format string as a template into which the remaining argument
   /// values are substituted according to given locale information.
-  public init(format: String, locale: Locale?, arguments: [CVarArg]) {
+  public init(format: __shared String, locale: __shared Locale?, arguments: __shared [CVarArg]) {
 #if DEPLOYMENT_RUNTIME_SWIFT
     self = withVaList(arguments) {
       String._unconditionallyBridgeFromObjectiveC(
diff --git a/stdlib/public/SDK/Foundation/TimeZone.swift b/stdlib/public/SDK/Foundation/TimeZone.swift
@@ -50,7 +50,7 @@ public struct TimeZone : Hashable, Equatable, ReferenceConvertible {
     /// An example identifier is "America/Los_Angeles".
     ///
     /// If `identifier` is an unknown identifier, then returns `nil`.
-    public init?(identifier: String) {
+    public init?(identifier: __shared String) {
         if let r = NSTimeZone(name: identifier) {
             _wrapped = r
             _autoupdating = false
@@ -83,7 +83,7 @@ public struct TimeZone : Hashable, Equatable, ReferenceConvertible {
     ///
     /// - parameter abbreviation: The abbreviation for the time zone.
     /// - returns: A time zone identified by abbreviation determined by resolving the abbreviation to an identifier using the abbreviation dictionary and then returning the time zone for that identifier. Returns `nil` if there is no match for abbreviation.
-    public init?(abbreviation: String) {
+    public init?(abbreviation: __shared String) {
         if let r = NSTimeZone(abbreviation: abbreviation) {
             _wrapped = r
             _autoupdating = false
diff --git a/stdlib/public/SDK/Foundation/URL.swift b/stdlib/public/SDK/Foundation/URL.swift
diff --git a/stdlib/public/SDK/Foundation/URLComponents.swift b/stdlib/public/SDK/Foundation/URLComponents.swift
diff --git a/stdlib/public/SDK/Foundation/UUID.swift b/stdlib/public/SDK/Foundation/UUID.swift

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ extension Decimal {`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`extension Decimal : CustomStringConvertible {`
`455`		`- public init?(string: String, locale: Locale? = nil) {`
	`455`	`+ public init?(string: __shared String, locale: __shared Locale? = nil) {`
`456`	`456`	`let scan = Scanner(string: string)`
`457`	`457`	`var theDecimal = Decimal()`
`458`	`458`	`scan.locale = locale`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public struct IndexPath : ReferenceConvertible, Equatable, Hashable, MutableColl`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`		`- mutating func append(contentsOf other: [Int]) {`
	`159`	`+ mutating func append(contentsOf other: __owned [Int]) {`
`160`	`160`	`switch self {`
`161`	`161`	`case .empty:`
`162`	`162`	`switch other.count {`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ extension CFError : Error {`
`359`	`359`	`public protocol _ObjectiveCBridgeableError : Error {`
`360`	`360`	`/// Produce a value of the error type corresponding to the given NSError,`
`361`	`361`	`/// or return nil if it cannot be bridged.`
`362`		`- init?(_bridgedNSError: NSError)`
	`362`	`+ init?(_bridgedNSError: __shared NSError)`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`/// A hook for the runtime to use _ObjectiveCBridgeableError in order to`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`extension NSExpression {`
`16`	`16`	`// + (NSExpression ) expressionWithFormat:(NSString )expressionFormat, ...;`
`17`	`17`	`public`
`18`		`- convenience init(format expressionFormat: String, _ args: CVarArg...) {`
	`18`	`+ convenience init(format expressionFormat: __shared String, _ args: CVarArg...) {`
`19`	`19`	`let va_args = getVaList(args)`
`20`	`20`	`self.init(format: expressionFormat, arguments: va_args)`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ fileprivate extension NSObject {`
`81`	`81`
`82`	`82`	`@nonobjc static var keyPathTableLock = NSLock()`
`83`	`83`
`84`		`- @nonobjc fileprivate static func _bridgeKeyPath(_ keyPath:AnyKeyPath) -> String {`
	`84`	`+ @nonobjc fileprivate static func _bridgeKeyPath(_ keyPath: __owned AnyKeyPath) -> String {`
`85`	`85`	`guard let keyPathString = keyPath._kvcKeyPathString else { fatalError("Could not extract a String from KeyPath \(keyPath)") }`
`86`	`86`	`_KVOKeyPathBridgeMachinery.keyPathTableLock.lock()`
`87`	`87`	`defer { _KVOKeyPathBridgeMachinery.keyPathTableLock.unlock() }`
`@@ -199,27 +199,27 @@ public extension _KeyValueCodingAndObserving {`
`199`	`199`	`return result`
`200`	`200`	`}`
`201`	`201`
`202`		`- public func willChangeValue<Value>(for keyPath: KeyPath<Self, Value>) {`
	`202`	`+ public func willChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>) {`
`203`	`203`	`(self as! NSObject).willChangeValue(forKey: _bridgeKeyPathToString(keyPath))`
`204`	`204`	`}`
`205`	`205`
`206`		`- public func willChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: KeyPath<Self, Value>) {`
	`206`	`+ public func willChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: __owned KeyPath<Self, Value>) {`
`207`	`207`	`(self as! NSObject).willChange(changeKind, valuesAt: indexes, forKey: _bridgeKeyPathToString(keyPath))`
`208`	`208`	`}`
`209`	`209`
`210`		`- public func willChangeValue<Value>(for keyPath: KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {`
	`210`	`+ public func willChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {`
`211`	`211`	`(self as! NSObject).willChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)`
`212`	`212`	`}`
`213`	`213`
`214`		`- public func didChangeValue<Value>(for keyPath: KeyPath<Self, Value>) {`
	`214`	`+ public func didChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>) {`
`215`	`215`	`(self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath))`
`216`	`216`	`}`
`217`	`217`
`218`		`- public func didChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: KeyPath<Self, Value>) {`
	`218`	`+ public func didChange<Value>(_ changeKind: NSKeyValueChange, valuesAt indexes: IndexSet, for keyPath: __owned KeyPath<Self, Value>) {`
`219`	`219`	`(self as! NSObject).didChange(changeKind, valuesAt: indexes, forKey: _bridgeKeyPathToString(keyPath))`
`220`	`220`	`}`
`221`	`221`
`222`		`- public func didChangeValue<Value>(for keyPath: KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {`
	`222`	`+ public func didChangeValue<Value>(for keyPath: __owned KeyPath<Self, Value>, withSetMutation mutation: NSKeyValueSetMutationKind, using set: Set<Value>) -> Void {`
`223`	`223`	`(self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)`
`224`	`224`	`}`
`225`	`225`	`}`