Merge remote-tracking branch 'origin/master' into swift-4.0-branch

Author: swift-ci

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1699,15 +1699,6 @@ const char *_NSPrintForDebugger(void *cf) {
     }
 }
 
-// For CF functions with 'Get' semantics, the compiler currently assumes that the result is autoreleased and must be retained. It does so on all platforms by emitting a call to objc_retainAutoreleasedReturnValue. On Darwin, this is implemented by the ObjC runtime. On Linux, there is no runtime, and therefore we have to stub it out here ourselves. The compiler will eventually call swift_release to balance the retain below. This is a workaround until the compiler no longer emits this callout on Linux.
-void * objc_retainAutoreleasedReturnValue(void *obj) {
-    if (obj) {
-        swift_retain(obj);
-        return obj;
-    }
-    else return NULL;
-}
-        
 CFHashCode __CFHashDouble(double d) {
     return _CFHashDouble(d);
 }

Foundation/Data.swift

@@ -1514,7 +1514,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     @inline(__always)
     public func subdata(in range: Range<Index>) -> Data {
         _validateRange(range)
-        let length = count
         if count == 0 {
             return Data()
         }

Foundation/ExtraStringAPIs.swift

@@ -17,15 +17,15 @@ extension String.UTF16View.Index : Strideable {
     /// Construct from an integer offset.
     public init(_ offset: Int) {
         _precondition(offset >= 0, "Negative UTF16 index offset not allowed")
-        self.init(_offset: offset)
+        self.init(encodedOffset: offset)
     }
 
     public func distance(to other: String.UTF16View.Index) -> Int {
-        return _offset.distance(to: other._offset)
+        return encodedOffset.distance(to: other.encodedOffset)
     }
 
     public func advanced(by n: Int) -> String.UTF16View.Index {
-        return String.UTF16View.Index(_offset.advanced(by: n))
+        return String.UTF16View.Index(encodedOffset.advanced(by: n))
     }
 }
 

Foundation/FileManager.swift

@@ -624,7 +624,7 @@ open class FileManager : NSObject {
         }
     }
 
-    open func createFile(atPath path: String, contents data: Data?, attributes attr: [String : Any]? = [:]) -> Bool {
+    open func createFile(atPath path: String, contents data: Data?, attributes attr: [FileAttributeKey : Any]? = nil) -> Bool {
         do {
             try (data ?? Data()).write(to: URL(fileURLWithPath: path), options: .atomic)
             return true

Foundation/NSCharacterSet.swift

@@ -50,13 +50,18 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
     }
 
     open override func isEqual(_ value: Any?) -> Bool {
+        guard let runtimeClass = _CFRuntimeGetClassWithTypeID(CFCharacterSetGetTypeID()) else {
+            fatalError("Could not obtain CFRuntimeClass of CFCharacterSet")
+        }
+
+        guard let equalFunction = runtimeClass.pointee.equal else {
+            fatalError("Could not obtain equal function from CFRuntimeClass of CFCharacterSet")
+        }
+
         switch value {
-        case let other as CharacterSet:
-            return CFEqual(_cfObject, other._cfObject)
-        case let other as NSCharacterSet:
-            return CFEqual(_cfObject, other._cfObject)
-        default:
-            return false
+        case let other as CharacterSet: return equalFunction(self._cfObject, other._cfObject) == true
+        case let other as NSCharacterSet: return equalFunction(self._cfObject, other._cfObject) == true
+        default: return false
         }
     }
 

Foundation/NSJSONSerialization.swift

@@ -31,6 +31,7 @@ extension JSONSerialization {
         public init(rawValue: UInt) { self.rawValue = rawValue }
 
         public static let prettyPrinted = WritingOptions(rawValue: 1 << 0)
+        public static let sortedKeys = WritingOptions(rawValue: 1 << 1)
     }
 }
 
@@ -116,6 +117,7 @@ open class JSONSerialization : NSObject {
 
         var writer = JSONWriter(
             pretty: opt.contains(.prettyPrinted),
+            sortedKeys: opt.contains(.sortedKeys),
             writer: { (str: String?) in
                 if let str = str {
                     jsonStr.append(str)
@@ -289,6 +291,7 @@ private struct JSONWriter {
     private let maxIntLength = String(describing: Int.max).characters.count
     var indent = 0
     let pretty: Bool
+    let sortedKeys: Bool
     let writer: (String?) -> Void
 
     private lazy var _numberformatter: CFNumberFormatter = {
@@ -299,8 +302,9 @@ private struct JSONWriter {
         return formatter
     }()
 
-    init(pretty: Bool = false, writer: @escaping (String?) -> Void) {
+    init(pretty: Bool = false, sortedKeys: Bool = false, writer: @escaping (String?) -> Void) {
         self.pretty = pretty
+        self.sortedKeys = sortedKeys
         self.writer = writer
     }
 
@@ -499,10 +503,10 @@ private struct JSONWriter {
             writer("\n")
             incAndWriteIndent()
         }
-        
+
         var first = true
-        
-        for (key, value) in dict {
+
+        func serializeDictionaryElement(key: AnyHashable, value: Any) throws {
             if first {
                 first = false
             } else if pretty {
@@ -511,15 +515,37 @@ private struct JSONWriter {
             } else {
                 writer(",")
             }
-            
-            if key is String {
-                try serializeString(key as! String)
+
+            if let key = key as? String {
+                try serializeString(key)
             } else {
                 throw NSError(domain: NSCocoaErrorDomain, code: CocoaError.propertyListReadCorrupt.rawValue, userInfo: ["NSDebugDescription" : "NSDictionary key must be NSString"])
             }
             pretty ? writer(": ") : writer(":")
             try serializeJSON(value)
         }
+
+        if sortedKeys {
+            let elems = try dict.sorted(by: { a, b in
+                guard let a = a.key as? String,
+                    let b = b.key as? String else {
+                        throw NSError(domain: NSCocoaErrorDomain, code: CocoaError.propertyListReadCorrupt.rawValue, userInfo: ["NSDebugDescription" : "NSDictionary key must be NSString"])
+                }
+                let options: NSString.CompareOptions = [.numeric, .caseInsensitive, .forcedOrdering]
+                let range: Range<String.Index>  = a.startIndex..<a.endIndex
+                let locale = NSLocale.system
+
+                return a.compare(b, options: options, range: range, locale: locale) == .orderedAscending
+            })
+            for elem in elems {
+                try serializeDictionaryElement(key: elem.key, value: elem.value)
+            }
+        } else {
+            for (key, value) in dict {
+                try serializeDictionaryElement(key: key, value: value)
+            }
+        }
+
         if pretty {
             writer("\n")
             decAndWriteIndent()

Foundation/NSLocale.swift

@@ -84,7 +84,7 @@ extension NSLocale {
         return CFLocaleCopyCurrent()._swiftObject
     }
 
-    open class func systemLocale() -> Locale {
+    open class var system: Locale {
         return CFLocaleGetSystem()._swiftObject
     }
 }

Foundation/NSNotification.swift

@@ -90,6 +90,7 @@ private class NSNotificationReceiver : NSObject {
     fileprivate var name: Notification.Name?
     fileprivate var block: ((Notification) -> Void)?
     fileprivate var sender: AnyObject?
+    fileprivate var queue: OperationQueue?
 }
 
 extension Sequence where Iterator.Element : NSNotificationReceiver {
@@ -159,7 +160,12 @@ open class NotificationCenter: NSObject {
                 continue
             }
 
-            block(notification)
+            if let queue = observer.queue, queue != OperationQueue.current {
+                queue.addOperation { block(notification) }
+                queue.waitUntilAllOperationsAreFinished()
+            } else {
+                block(notification)
+            }
         }
     }
 
@@ -183,17 +189,14 @@ open class NotificationCenter: NSObject {
     }
 
     open func addObserver(forName name: Notification.Name?, object obj: Any?, queue: OperationQueue?, usingBlock block: @escaping (Notification) -> Void) -> NSObjectProtocol {
-        if queue != nil {
-            NSUnimplemented()
-        }
-
         let object = NSObject()
 
         let newObserver = NSNotificationReceiver()
         newObserver.object = object
         newObserver.name = name
         newObserver.block = block
         newObserver.sender = _SwiftValue.store(obj)
+        newObserver.queue = queue
 
         _observersLock.synchronized({
             _observers.append(newObserver)

Foundation/NSPersonNameComponents.swift

@@ -64,6 +64,28 @@ open class NSPersonNameComponents : NSObject, NSCopying, NSSecureCoding {
         }
         return copy
     }
+
+    open override func isEqual(_ object: Any?) -> Bool {
+        guard let object = object else { return false }
+
+        switch object {
+        case let other as NSPersonNameComponents: return self.isEqual(other)
+        case let other as PersonNameComponents: return self.isEqual(other._bridgeToObjectiveC())
+        default: return false
+        }
+    }
+
+    private func isEqual(_ other: NSPersonNameComponents) -> Bool {
+        if self === other { return true }
+        
+        return (self.namePrefix == other.namePrefix
+            && self.givenName == other.givenName
+            && self.middleName == other.middleName
+            && self.familyName == other.familyName
+            && self.nameSuffix == other.nameSuffix
+            && self.nickname == other.nickname
+            && self.phoneticRepresentation == other.phoneticRepresentation)
+    }
 
     /* The below examples all assume the full name Dr. Johnathan Maple Appleseed Esq., nickname "Johnny" */
 

Foundation/NSRange.swift

@@ -261,8 +261,8 @@ extension NSRange {
         where R.Bound == S.Index, S.Index == String.Index {
             let r = region.relative(to: target)
             self = NSRange(
-                location: r.lowerBound._utf16Index - target.startIndex._utf16Index,
-                length: r.upperBound._utf16Index - r.lowerBound._utf16Index
+                location: r.lowerBound.encodedOffset - target.startIndex.encodedOffset,
+                length: r.upperBound.encodedOffset - r.lowerBound.encodedOffset
             )
     }
 

Foundation/NSStringAPI.swift

@@ -30,8 +30,8 @@ func _toNSArray<T, U : AnyObject>(_ a: [T], f: (T) -> U) -> NSArray {
 
 func _toNSRange(_ r: Range<String.Index>) -> NSRange {
   return NSRange(
-    location: r.lowerBound._utf16Index,
-    length: r.upperBound._utf16Index - r.lowerBound._utf16Index)
+    location: r.lowerBound.encodedOffset,
+    length: r.upperBound.encodedOffset - r.lowerBound.encodedOffset)
 }
 
 extension String {
@@ -47,10 +47,7 @@ extension String {
   /// Return an `Index` corresponding to the given offset in our UTF-16
   /// representation.
   func _index(_ utf16Index: Int) -> Index {
-    return Index(
-      _base: String.UnicodeScalarView.Index(_position: utf16Index),
-      in: characters
-    )
+    return Index(encodedOffset: utf16Index)
   }
 
   /// Return a `Range<Index>` corresponding to the given `NSRange` of
@@ -1076,7 +1073,7 @@ extension String {
   public
   func rangeOfComposedCharacterSequence(at anIndex: Index) -> Range<Index> {
     return _range(
-      _ns.rangeOfComposedCharacterSequence(at: anIndex._utf16Index))
+      _ns.rangeOfComposedCharacterSequence(at: anIndex.encodedOffset))
   }
 
   // - (NSRange)rangeOfComposedCharacterSequencesForRange:(NSRange)range
@@ -1392,15 +1389,15 @@ extension String {
   /// Returns a new string containing the characters of the
   /// `String` from the one at a given index to the end.
   public func substring(from index: Index) -> String {
-    return _ns.substring(from: index._utf16Index)
+    return _ns.substring(from: index.encodedOffset)
   }
 
   // - (NSString *)substringToIndex:(NSUInteger)anIndex
 
   /// Returns a new string containing the characters of the
   /// `String` up to, but not including, the one at a given index.
   public func substring(to index: Index) -> String {
-    return _ns.substring(to: index._utf16Index)
+    return _ns.substring(to: index.encodedOffset)
   }
 
   // - (NSString *)substringWithRange:(NSRange)aRange

Foundation/NSURLSession/http/EasyHandle.swift

@@ -57,6 +57,9 @@ internal final class _EasyHandle {
     fileprivate var pauseState: _PauseState = []
     internal var fileLength: Int64 = 0
     internal var timeoutTimer: _TimeoutSource!
+    #if os(Android)
+    static fileprivate var _CAInfoFile: UnsafeMutablePointer<Int8>?
+    #endif
 
     init(delegate: _EasyHandleDelegate) {
         self.delegate = delegate
@@ -168,6 +171,20 @@ extension _EasyHandle {
         let protocols = (CFURLSessionProtocolHTTP | CFURLSessionProtocolHTTPS)
         try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionPROTOCOLS, protocols).asError()
         try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionREDIR_PROTOCOLS, protocols).asError()
+        #if os(Android)
+            // See https://curl.haxx.se/docs/sslcerts.html
+            // For SSL to work you need "cacert.pem" to be accessable
+            // at the path pointed to by the URLSessionCAInfo env var.
+            // Downloadable here: https://curl.haxx.se/ca/cacert.pem
+            if let caInfo = _EasyHandle._CAInfoFile  {
+                if String(cString: caInfo) == "UNSAFE_SSL_NOVERIFY" {
+                    try! CFURLSession_easy_setopt_int(rawHandle, CFURLSessionOptionSSL_VERIFYPEER, 0).asError()
+                }
+                else {
+                    try! CFURLSession_easy_setopt_ptr(rawHandle, CFURLSessionOptionCAINFO, caInfo).asError()
+                }
+            }
+        #endif
         //TODO: Added in libcurl 7.45.0
         //TODO: Set default protocol for schemeless URLs
         //CURLOPT_DEFAULT_PROTOCOL available only in libcurl 7.45.0
@@ -268,7 +285,7 @@ fileprivate func printLibcurlDebug(handle: CFURLSessionEasyHandle, type: CInt, d
 
 fileprivate func printLibcurlDebug(type: CFURLSessionInfo, data: String, task: URLSessionTask) {
     // libcurl sends is data with trailing CRLF which inserts lots of newlines into our output.
-    print("[\(task.taskIdentifier)] \(type.debugHeader) \(data.mapControlToPictures)")
+    NSLog("[\(task.taskIdentifier)] \(type.debugHeader) \(data.mapControlToPictures)")
 }
 
 fileprivate extension String {
@@ -615,6 +632,19 @@ extension _EasyHandle._CurlStringList {
     }
 }
 
+#if os(Android)
+extension URLSession {
+
+    public static func setCAInfoFile(_ _CAInfoFile: String) {
+        free(_EasyHandle._CAInfoFile)
+        _CAInfoFile.withCString {
+            _EasyHandle._CAInfoFile = strdup($0)
+        }
+    }
+
+}
+#endif
+
 extension CFURLSessionEasyCode : Equatable {
     public static func ==(lhs: CFURLSessionEasyCode, rhs: CFURLSessionEasyCode) -> Bool {
         return lhs.value == rhs.value

Foundation/NSURLSession/http/HTTPURLProtocol.swift

@@ -439,8 +439,14 @@ extension _HTTPURLProtocol {
 extension _HTTPURLProtocol: _EasyHandleDelegate {
 
     func didReceive(data: Data) -> _EasyHandle._Action {
-        guard case .transferInProgress(let ts) = internalState else { fatalError("Received body data, but no transfer in progress.") }
-        guard ts.isHeaderComplete else { fatalError("Received body data, but the header is not complete, yet.") }
+        guard case .transferInProgress(var ts) = internalState else { fatalError("Received body data, but no transfer in progress.") }
+        if !ts.isHeaderComplete {
+            ts.response = HTTPURLResponse(url: ts.url, statusCode: 200, httpVersion: "HTTP/0.9", headerFields: [:])
+            /* we received body data before CURL tells us that the headers are complete, that happens for HTTP/0.9 simple responses, see
+               - https://www.w3.org/Protocols/HTTP/1.0/spec.html#Message-Types
+               - https://github.com/curl/curl/issues/467
+            */
+        }
         notifyDelegate(aboutReceivedData: data)
         internalState = .transferInProgress(ts.byAppending(bodyData: data))
         return .proceed