Merge pull request swiftlang#22274 from apple/update-master-xcode-10.2-beta-1

Update master to build with Xcode 10.2 beta 1

Author: shahmishal

stdlib/public/Darwin/Foundation/NSString.swift

@@ -16,12 +16,6 @@
 // Strings
 //===----------------------------------------------------------------------===//
 
-@available(*, unavailable, message: "Please use String or NSString")
-public class NSSimpleCString {}
-
-@available(*, unavailable, message: "Please use String or NSString")
-public class NSConstantString {}
-
 extension NSString : ExpressibleByStringLiteral {
   /// Create an instance initialized to `value`.
   public required convenience init(stringLiteral value: StaticString) {

stdlib/public/Darwin/SceneKit/SceneKit.swift.gyb

@@ -181,21 +181,15 @@ extension SCNGeometryElement {
 extension SCNGeometrySource {
   @nonobjc
   public convenience init(vertices: [SCNVector3]) {
-    fatalError()
-    // FIXME: <rdar://problem/43534146>
-    // self.init(__vertices: vertices, count: vertices.count)
+    self.init(__vertices: vertices, count: vertices.count)
   }
   @nonobjc
   public convenience init(normals: [SCNVector3]) {
-    fatalError()
-    // FIXME: <rdar://problem/43534146>
-    // self.init(__normals: normals, count: normals.count)
+    self.init(__normals: normals, count: normals.count)
   }
   @nonobjc
   public convenience init(textureCoordinates: [CGPoint]) {
-    fatalError()
-    // FIXME: <rdar://problem/43534146>
-    // self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
+    self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
   }
 }
 

test/Interpreter/SDK/FoundationDiagnostics.swift

@@ -4,11 +4,6 @@
 
 import Foundation
 
-func useUnavailable() {
-  var a = NSSimpleCString() // expected-error {{'NSSimpleCString' is unavailable}}
-  var b = NSConstantString() // expected-error {{'NSConstantString' is unavailable}}
-}
-
 func encode(_ string: String) {
   _ = string.cString(using: NSUTF8StringEncoding) // expected-error {{'NSUTF8StringEncoding' has been renamed to 'String.Encoding.utf8'}} {{29-49=String.Encoding.utf8}}
   let _: NSStringEncoding? = nil // expected-error {{'NSStringEncoding' has been renamed to 'String.Encoding'}} {{10-26=String.Encoding}}

validation-test/stdlib/SceneKit.swift

@@ -132,9 +132,7 @@ if #available(iOS 8.0, *) {
     expectEqual(1, element.bytesPerIndex)
   }
 
-  SceneKitTests.test("SCNGeometrySource.init(vertices:)")
-    .skip(.always("rdar://problem/43534146"))
-    .code {
+  SceneKitTests.test("SCNGeometrySource.init(vertices:)") {
     let source = SCNGeometrySource(vertices: [SCNVector3(1, 2, 3),
                                               SCNVector3(4, 5, 6)])
 
@@ -148,9 +146,7 @@ if #available(iOS 8.0, *) {
     expectEqual(positions[4], 5)
   }
 
-  SceneKitTests.test("SCNGeometrySource.init(normals:)")
-    .skip(.always("rdar://problem/43534146"))
-    .code {
+  SceneKitTests.test("SCNGeometrySource.init(normals:)") {
     let source = SCNGeometrySource(normals: [SCNVector3(1, 2, 3),
                                              SCNVector3(4, 5, 6)])
 
@@ -164,9 +160,7 @@ if #available(iOS 8.0, *) {
     expectEqual(normals[4], 5)
   }
 
-  SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)")
-    .skip(.always("rdar://problem/43534146"))
-    .code {
+  SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)") {
     let source = SCNGeometrySource(textureCoordinates: [CGPoint(x: 1, y: 2),
                                                         CGPoint(x: 4, y: 5)])