Merge pull request #3870 from jckarter/no-bridged-default-literal-types

Sema: Don't try bridged classes as default literal types.

Author: jckarter

lib/Sema/ConstraintSystem.cpp

@@ -256,15 +256,6 @@ getAlternativeLiteralTypes(KnownProtocolKind kind) {
 
   SmallVector<Type, 4> types;
 
-  // If the default literal type is bridged to a class type, add the class type.
-  if (auto proto = TC.Context.getProtocol(kind)) {
-    if (auto defaultType = TC.getDefaultType(proto, DC)) {
-      if (auto bridgedClassType = TC.getBridgedToObjC(DC, defaultType)) {
-        types.push_back(bridgedClassType);
-      }
-    }
-  }
-
   // Some literal kinds are related.
   switch (kind) {
 #define PROTOCOL_WITH_NAME(Id, Name) \

stdlib/public/SDK/XCTest/XCTest.swift

@@ -70,13 +70,13 @@ func _XCTRunThrowableBlock(_ block: @noescape () throws -> Void) -> _XCTThrowabl
   if let blockError = blockErrorOptional {
     return .failedWithError(error: blockError)
   } else if d.count > 0 {
-    let t: String = d["type"] as! String
+    let t: String = d["type" as NSString] as! String
 
     if t == "objc" {
       return .failedWithException(
-        className: d["className"] as! String,
-        name: d["name"] as! String,
-        reason: d["reason"] as! String)
+        className: d["className" as NSString] as! String,
+        name: d["name" as NSString] as! String,
+        reason: d["reason" as NSString] as! String)
     } else {
       return .failedWithUnknownException
     }

test/1_stdlib/ArrayTrapsObjC.swift.gyb

@@ -37,7 +37,7 @@ ArrayTraps.test("downcast2")
     { _isFastAssertConfiguration() },
     reason: "this trap is not guaranteed to happen in -Ounchecked"))
   .code {
-  let a: [AnyObject] = ["String", 1]
+  let a: [AnyObject] = ["String" as NSString, 1 as NSNumber]
   let sa = a as! [NSString]
   let s0 = sa[0]
   expectCrashLater()

test/1_stdlib/DictionaryLiteral.swift

@@ -51,8 +51,8 @@ let anNSString = "Foo" as NSString
 var stringNSStringLet: DictionaryLiteral = [ "a": aString as NSString, "b": anNSString]
 expectType(DictionaryLiteral<String, NSString>.self, &stringNSStringLet)
 
-var hetero1: DictionaryLiteral = ["a": 1, "b": "Foo" as NSString]
+var hetero1: DictionaryLiteral = ["a": 1 as NSNumber, "b": "Foo" as NSString]
 expectType(DictionaryLiteral<String, NSObject>.self, &hetero1)
 
-var hetero2: DictionaryLiteral = ["a": 1, "b": "Foo"]
+var hetero2: DictionaryLiteral = ["a": 1 as NSNumber, "b": "Foo" as NSString]
 expectType(DictionaryLiteral<String, NSObject>.self, &hetero2)

test/1_stdlib/NSArrayAPI.swift

@@ -12,13 +12,13 @@ var NSArrayAPI = TestSuite("NSArrayAPI")
 
 NSArrayAPI.test("mixed types with AnyObject") {
   do {
-    let result: AnyObject = [1, "two"]
-    let expect: NSArray = [1, "two"]
+    let result: AnyObject = [1 as NSNumber, "two" as NSString] as NSArray
+    let expect: NSArray = [1 as NSNumber, "two" as NSString]
     expectEqual(expect, result as! NSArray)
   }
   do {
-    let result: AnyObject = [1, 2]
-    let expect: NSArray = [1, 2]
+    let result: AnyObject = [1 as NSNumber, 2 as NSNumber] as NSArray
+    let expect: NSArray = [1 as NSNumber, 2 as NSNumber]
     expectEqual(expect, result as! NSArray)
   }
 }

test/1_stdlib/NSObject.swift

@@ -71,10 +71,10 @@ let o1 = NSObject.init()
 let o2 = NSObject.init()
 printIdentity(o1, o2, "o1", "o2")
 printEquality(o1, o2, "o1", "o2")
-printIdentity(o1, 10, "o1", "10")
-printEquality(o1, 10, "o1", "10")
-printIdentity(10, o1, "10", "o1")
-printEquality(10, o1, "10", "o1")
+printIdentity(o1, 10 as NSNumber, "o1", "10")
+printEquality(o1, 10 as NSNumber, "o1", "10")
+printIdentity(10 as NSNumber, o1, "10", "o1")
+printEquality(10 as NSNumber, o1, "10", "o1")
 print("done NSObject ==")
 // CHECK: NSObject ==
 // CHECK-NEXT: o1 === o1

test/1_stdlib/NSStringAPI.swift

@@ -841,11 +841,6 @@ NSStringAPIs.test("init(format:locale:arguments:)") {
       locale: nil, arguments: args))
 }
 
-NSStringAPIs.test("lastPathComponent") {
-  expectEqual("bar", "/foo/bar".lastPathComponent)
-  expectEqual("абв", "/foo/абв".lastPathComponent)
-}
-
 NSStringAPIs.test("utf16Count") {
   expectEqual(1, "a".utf16.count)
   expectEqual(2, "\u{0001F60A}".utf16.count)
@@ -1035,11 +1030,6 @@ NSStringAPIs.test("pathComponents") {
   expectEqual([ "/", "абв", "где" ] as [NSString], ("/абв/где" as NSString).pathComponents as [NSString])
 }
 
-NSStringAPIs.test("pathExtension") {
-  expectEqual("", "/foo/bar".pathExtension)
-  expectEqual("txt", "/foo/bar.txt".pathExtension)
-}
-
 NSStringAPIs.test("precomposedStringWithCanonicalMapping") {
   expectEqual("abc", "abc".precomposedStringWithCanonicalMapping)
   expectEqual("だくてん",
@@ -1359,26 +1349,13 @@ NSStringAPIs.test("appendingFormat(_:_:...)") {
       .appendingFormat("def %@ %ld", formatArg, 42))
 }
 
-NSStringAPIs.test("appendingPathComponent(_:)") {
-  expectEqual("", "".appendingPathComponent(""))
-  expectEqual("a.txt", "".appendingPathComponent("a.txt"))
-  expectEqual("/tmp/a.txt", "/tmp".appendingPathComponent("a.txt"))
-}
-
 NSStringAPIs.test("appending(_:)") {
   expectEqual("", "".appending(""))
   expectEqual("a", "a".appending(""))
   expectEqual("a", "".appending("a"))
   expectEqual("さ\u{3099}", "さ".appending("\u{3099}"))
 }
 
-NSStringAPIs.test("deletingLastPathComponent") {
-  expectEqual("", "".deletingLastPathComponent)
-  expectEqual("/", "/".deletingLastPathComponent)
-  expectEqual("/", "/tmp".deletingLastPathComponent)
-  expectEqual("/tmp", "/tmp/a.txt".deletingLastPathComponent)
-}
-
 NSStringAPIs.test("folding(options:locale:)") {
 
   func fwo(
@@ -1597,22 +1574,6 @@ NSStringAPIs.test("replacingPercentEscapes(using:)/rdar18029471")
       using: .ascii))
 }
 
-NSStringAPIs.test("resolvingSymlinksInPath") {
-  // <rdar://problem/18030188> Difference between
-  // resolvingSymlinksInPath and stringByStandardizingPath is unclear
-  expectEqual("", "".resolvingSymlinksInPath)
-  expectEqual(
-    "/var", "/private/var/tmp////..//".resolvingSymlinksInPath)
-}
-
-NSStringAPIs.test("standardizingPath") {
-  // <rdar://problem/18030188> Difference between
-  // resolvingSymlinksInPath and standardizingPath is unclear
-  expectEqual("", "".standardizingPath)
-  expectEqual(
-    "/var", "/private/var/tmp////..//".standardizingPath)
-}
-
 NSStringAPIs.test("trimmingCharacters(in:)") {
   expectEqual("", "".trimmingCharacters(
     in: CharacterSet.decimalDigits))

test/1_stdlib/RuntimeObjC.swift

@@ -747,7 +747,7 @@ Reflection.test("Unmanaged/nil") {
 Reflection.test("Unmanaged/not-nil") {
   var output = ""
   var optionalURL: Unmanaged<CFURL>? =
-    Unmanaged.passRetained(CFURLCreateWithString(nil, "http://llvm.org/", nil))
+    Unmanaged.passRetained(CFURLCreateWithString(nil, "http://llvm.org/" as CFString, nil))
   dump(optionalURL, to: &output)
 
   let expected =

test/Interpreter/SDK/Foundation_NSExpression.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 // Test overlain variadic methods.
-let expression = NSExpression(format: "(3 + 2)**2", "LLLL", "BBBB")
+let expression = NSExpression(format: "(3 + 2)**2", "LLLL" as NSString, "BBBB" as NSString)
 let result = expression.expressionValue(with: expression, context:nil) as! NSNumber
 let number = result.stringValue
 print(number)

test/Interpreter/SDK/Foundation_NSLog.swift

@@ -19,5 +19,5 @@ testNSLog()
 // CHECK: 1 is the loneliest number that you'll ever do
 NSLog(
   "%@ is the loneliest number that you'll ever %@", 
-  NSNumber(value: 1), "do"
+  NSNumber(value: 1), "do" as NSString
 )