Merge pull request #3567 from apple/stdlib-remove-boolean

Author: swift-ci

benchmark/single-source/unit-tests/ObjectiveCBridgingStubs.swift

@@ -169,7 +169,7 @@ func testObjectiveCBridgeStubURLAppendPath() {
   for _ in 0 ..< 10_000 {
     var url = startUrl
     for _ in 0 ..< 10 {
-      try! url.appendPathComponent("foo")
+      url.appendPathComponent("foo")
     }
   }
 }

benchmark/single-source/unit-tests/ObjectiveCNoBridgingStubs.swift

@@ -134,7 +134,7 @@ func testObjectiveCBridgeStubURLAppendPathRef() {
   for _ in 0 ..< 10_000 {
     var url = startUrl
     for _ in 0 ..< 10 {
-      url = try! url.appendingPathComponent("foo")
+      url = url.appendingPathComponent("foo")
     }
   }
 }

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -453,10 +453,6 @@ public struct AssertionResult : CustomStringConvertible {
     self._isPass = isPass
   }
 
-  public var boolValue: Bool {
-    return _isPass
-  }
-
   public func withDescription(_ description: String) -> AssertionResult {
     var result = self
     result.description += description
@@ -486,13 +482,13 @@ public func expectUnreachableCatch(_ error: Error, ${TRACE}) {
 }
 
 public func expectTrue(_ actual: AssertionResult, ${TRACE}) {
-  if !actual.boolValue {
+  if !actual._isPass {
     expectationFailure("expected: true", trace: ${trace})
   }
 }
 
 public func expectFalse(_ actual: AssertionResult, ${TRACE}) {
-  if actual.boolValue {
+  if actual._isPass {
     expectationFailure("expected: false", trace: ${trace})
   }
 }

stdlib/public/core/Bool.swift

@@ -108,7 +108,8 @@ extension Bool : _ExpressibleByBuiltinBooleanLiteral, ExpressibleByBooleanLitera
 extension Bool {
   // This is a magic entry point known to the compiler.
   @_transparent
-  public func _getBuiltinLogicValue() -> Builtin.Int1 {
+  public // COMPILER_INTRINSIC
+  func _getBuiltinLogicValue() -> Builtin.Int1 {
     return _value
   }
 }

test/1_stdlib/PrintBoolean.swift

@@ -11,17 +11,17 @@ PrintTests.test("CustomStringConvertible") {
     expectTrue(any is CustomStringConvertible)
   }
 
-  hasDescription(Bool(true))
-  hasDescription(CBool(true))
+  hasDescription(true as Bool)
+  hasDescription(true as CBool)
 }
 
 PrintTests.test("Printable") {
-  expectPrinted("true", CBool(true))
-  expectPrinted("false", CBool(false))
-  
-  expectPrinted("true", Bool(true))
-  expectPrinted("false", Bool(false))
-  
+  expectPrinted("true", true as CBool)
+  expectPrinted("false", false as CBool)
+
+  expectPrinted("true", true as Bool)
+  expectPrinted("false", false as Bool)
+
   expectPrinted("true", true)
   expectPrinted("false", false)
 }

test/1_stdlib/Runtime.swift.gyb

@@ -66,34 +66,33 @@ Runtime.test("_canBeClass") {
 
 //===----------------------------------------------------------------------===//
 
-protocol MyBoolean {
-  var boolValue : Bool { get }
-}
-
-extension Bool : MyBoolean {
-  var boolValue : Bool { return self }
-}
-
 // The protocol should be defined in the standard library, otherwise the cast
 // does not work.
-typealias P1 = MyBoolean
+typealias P1 = CustomReflectable
 typealias P2 = CustomStringConvertible
 protocol Q1 {}
 
+extension P1 {
+  var success: Bool {
+    print(String(customMirror))
+    return String(customMirror) == "Mirror for ()"
+  }
+}
+
 // A small struct that can be stored inline in an opaque buffer.
-struct StructConformsToP1 : MyBoolean, Q1 {
-  var boolValue: Bool {
-    return true
+struct StructConformsToP1 : CustomReflectable, Q1 {
+  var customMirror: Mirror {
+    return Mirror(reflecting: ())
   }
 }
 
 // A small struct that can be stored inline in an opaque buffer.
-struct Struct2ConformsToP1<T : MyBoolean> : MyBoolean, Q1 {
+struct Struct2ConformsToP1<T : CustomReflectable> : CustomReflectable, Q1 {
   init(_ value: T) {
     self.value = value
   }
-  var boolValue: Bool {
-    return value.boolValue
+  var customMirror: Mirror {
+    return value.customMirror
   }
   var value: T
 }
@@ -143,18 +142,18 @@ struct Struct4ConformsToP2<T : CustomStringConvertible> : CustomStringConvertibl
 
 struct StructDoesNotConformToP1 : Q1 {}
 
-class ClassConformsToP1 : MyBoolean, Q1 {
-  var boolValue: Bool {
-    return true
+class ClassConformsToP1 : CustomReflectable, Q1 {
+  var customMirror: Mirror {
+    return Mirror(reflecting: ())
   }
 }
 
-class Class2ConformsToP1<T : MyBoolean> : MyBoolean, Q1 {
+class Class2ConformsToP1<T : CustomReflectable> : CustomReflectable, Q1 {
   init(_ value: T) {
     self.value = [value]
   }
-  var boolValue: Bool {
-    return value[0].boolValue
+  var customMirror: Mirror {
+    return value[0].customMirror
   }
   // FIXME: should be "var value: T", but we don't support it now.
   var value: Array<T>
@@ -164,12 +163,12 @@ class ClassDoesNotConformToP1 : Q1 {}
 
 Runtime.test("dynamicCasting with as") {
   var someP1Value = StructConformsToP1()
-  var someP1Value2 = Struct2ConformsToP1(true)
+  var someP1Value2 = Struct2ConformsToP1(StructConformsToP1())
   var someNotP1Value = StructDoesNotConformToP1()
   var someP2Value = Struct3ConformsToP2()
   var someP2Value2 = Struct4ConformsToP2(Struct3ConformsToP2())
   var someP1Ref = ClassConformsToP1()
-  var someP1Ref2 = Class2ConformsToP1(true)
+  var someP1Ref2 = Class2ConformsToP1(ClassConformsToP1())
   var someNotP1Ref = ClassDoesNotConformToP1()
 
   expectTrue(someP1Value is P1)
@@ -209,57 +208,57 @@ Runtime.test("dynamicCasting with as") {
   expectTrue(someP1Ref2 as AnyObject is P1)
   expectFalse(someNotP1Ref as AnyObject is P1)
 
-  expectTrue((someP1Value as P1).boolValue)
-  expectTrue((someP1Value2 as P1).boolValue)
+  expectTrue((someP1Value as P1).success)
+  expectTrue((someP1Value2 as P1).success)
   expectEqual("10 20 30 40", (someP2Value as P2).description)
   expectEqual("10 20 30 40 50 60 70 80", (someP2Value2 as P2).description)
 
-  expectTrue((someP1Ref as P1).boolValue)
-  expectTrue((someP1Ref2 as P1).boolValue)
+  expectTrue((someP1Ref as P1).success)
+  expectTrue((someP1Ref2 as P1).success)
 
-  expectTrue(((someP1Value as Q1) as! P1).boolValue)
-  expectTrue(((someP1Value2 as Q1) as! P1).boolValue)
+  expectTrue(((someP1Value as Q1) as! P1).success)
+  expectTrue(((someP1Value2 as Q1) as! P1).success)
   expectEqual("10 20 30 40", ((someP2Value as Q1) as! P2).description)
   expectEqual("10 20 30 40 50 60 70 80",
     ((someP2Value2 as Q1) as! P2).description)
-  expectTrue(((someP1Ref as Q1) as! P1).boolValue)
-  expectTrue(((someP1Ref2 as Q1) as! P1).boolValue)
+  expectTrue(((someP1Ref as Q1) as! P1).success)
+  expectTrue(((someP1Ref2 as Q1) as! P1).success)
 
-  expectTrue(((someP1Value as Any) as! P1).boolValue)
-  expectTrue(((someP1Value2 as Any) as! P1).boolValue)
+  expectTrue(((someP1Value as Any) as! P1).success)
+  expectTrue(((someP1Value2 as Any) as! P1).success)
   expectEqual("10 20 30 40", ((someP2Value as Any) as! P2).description)
   expectEqual("10 20 30 40 50 60 70 80",
     ((someP2Value2 as Any) as! P2).description)
-  expectTrue(((someP1Ref as Any) as! P1).boolValue)
-  expectTrue(((someP1Ref2 as Any) as! P1).boolValue)
+  expectTrue(((someP1Ref as Any) as! P1).success)
+  expectTrue(((someP1Ref2 as Any) as! P1).success)
 
-  expectTrue(((someP1Ref as AnyObject) as! P1).boolValue)
+  expectTrue(((someP1Ref as AnyObject) as! P1).success)
 
   expectEmpty((someNotP1Value as? P1))
   expectEmpty((someNotP1Ref as? P1))
 
-  expectTrue(((someP1Value as Q1) as? P1)!.boolValue)
-  expectTrue(((someP1Value2 as Q1) as? P1)!.boolValue)
+  expectTrue(((someP1Value as Q1) as? P1)!.success)
+  expectTrue(((someP1Value2 as Q1) as? P1)!.success)
   expectEmpty(((someNotP1Value as Q1) as? P1))
   expectEqual("10 20 30 40", ((someP2Value as Q1) as? P2)!.description)
   expectEqual("10 20 30 40 50 60 70 80",
     ((someP2Value2 as Q1) as? P2)!.description)
-  expectTrue(((someP1Ref as Q1) as? P1)!.boolValue)
-  expectTrue(((someP1Ref2 as Q1) as? P1)!.boolValue)
+  expectTrue(((someP1Ref as Q1) as? P1)!.success)
+  expectTrue(((someP1Ref2 as Q1) as? P1)!.success)
   expectEmpty(((someNotP1Ref as Q1) as? P1))
 
-  expectTrue(((someP1Value as Any) as? P1)!.boolValue)
-  expectTrue(((someP1Value2 as Any) as? P1)!.boolValue)
+  expectTrue(((someP1Value as Any) as? P1)!.success)
+  expectTrue(((someP1Value2 as Any) as? P1)!.success)
   expectEmpty(((someNotP1Value as Any) as? P1))
   expectEqual("10 20 30 40", ((someP2Value as Any) as? P2)!.description)
   expectEqual("10 20 30 40 50 60 70 80",
     ((someP2Value2 as Any) as? P2)!.description)
-  expectTrue(((someP1Ref as Any) as? P1)!.boolValue)
-  expectTrue(((someP1Ref2 as Any) as? P1)!.boolValue)
+  expectTrue(((someP1Ref as Any) as? P1)!.success)
+  expectTrue(((someP1Ref2 as Any) as? P1)!.success)
   expectEmpty(((someNotP1Ref as Any) as? P1))
 
-  expectTrue(((someP1Ref as AnyObject) as? P1)!.boolValue)
-  expectTrue(((someP1Ref2 as AnyObject) as? P1)!.boolValue)
+  expectTrue(((someP1Ref as AnyObject) as? P1)!.success)
+  expectTrue(((someP1Ref2 as AnyObject) as? P1)!.success)
   expectEmpty(((someNotP1Ref as AnyObject) as? P1))
 
   let doesThrow: (Int) throws -> Int = { $0 }

test/Inputs/clang-importer-sdk/swift-modules-without-ns/ObjectiveC.swift

@@ -10,7 +10,6 @@ public struct ObjCBool {
     self.value = value
   }
 
-  /// \brief Allow use in a Boolean context.
   public var boolValue: Bool {
     return value
   }
@@ -29,7 +28,6 @@ public struct ObjCBool {
     self.value = value
   }
 
-  /// \brief Allow use in a Boolean context.
   public var boolValue: Bool {
     if value == 0 { return false }
     return true

test/Inputs/clang-importer-sdk/swift-modules/ObjectiveC.swift

@@ -10,7 +10,6 @@ public struct ObjCBool {
     self.value = value
   }
 
-  /// \brief Allow use in a Boolean context.
   public var boolValue: Bool {
     return value
   }
@@ -29,7 +28,6 @@ public struct ObjCBool {
     self.value = value
   }
 
-  /// \brief Allow use in a Boolean context.
   public var boolValue: Bool {
     if value == 0 { return false }
     return true

test/Interpreter/bool_as_generic.swift

@@ -0,0 +1,27 @@
+// RUN: %target-run-simple-swift | FileCheck %s
+// REQUIRES: executable_test
+// <rdar://problem/13986638> Missing Bool metadata when Bool is used as a generic
+// parameter or existential value
+
+prefix operator !! {}
+infix operator &&& {}
+
+protocol BooleanProtocol {
+  var boolValue: Bool { get }
+}
+extension Bool : BooleanProtocol {
+  var boolValue: Bool { return self }
+}
+
+prefix func !!<T : BooleanProtocol>(x: T) -> Bool {
+  return x.boolValue
+}
+
+func &&&(x: BooleanProtocol, y: @autoclosure () -> BooleanProtocol) -> Bool {
+  return x.boolValue ? y().boolValue : false
+}
+
+print(!!true) // CHECK: true
+print(!!false) // CHECK: false
+print(true &&& true) // CHECK: true
+print(true &&& false) // CHECK: false

test/SILGen/Inputs/ObjectiveC.swift

@@ -5,7 +5,6 @@
 public struct ObjCBool {
   var value : UInt8
 
-  /// \brief Allow use in a Boolean context.
   public var boolValue: Bool {
     if value == 0 { return false }
     return true

validation-test/compiler_crashers_fixed/00017-llvm-foldingset-llvm-attributesetnode-nodeequals.swift

@@ -6,11 +6,17 @@
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 
-// RUN: not %target-swift-frontend %s -parse -verify
+// RUN: %target-swift-frontend %s -parse -verify
 
 // Issue found by https://github.com/jvasileff (John Vasileff)
 // This bug is NOT triggered when compiling with -O.
 
-func f<T : Boolean>(_ b: T) {
+protocol BooleanProtocol {
+  var boolValue: Bool { get }
 }
-f(true as Boolean) // expected-error {{cannot invoke 'f' with an argument list of type '(Boolean)'}} // expected-note {{expected an argument list of type '(T)'}}
+extension Bool : BooleanProtocol {
+  var boolValue: Bool { return self }
+}
+func f<T : BooleanProtocol>(_ b: T) {
+}
+f(true as BooleanProtocol) // expected-error {{cannot invoke 'f' with an argument list of type '(BooleanProtocol)'}} // expected-note {{expected an argument list of type '(T)'}}

validation-test/stdlib/FixedPoint.swift.gyb

@@ -346,11 +346,13 @@ BoolTestSuite.test("init()") {
 
 BoolTestSuite.test("Boolean") {
   do {
-    var v: Bool = false
+    var v = false
+    expectType(Bool.self, &v)
     expectFalse(v)
   }
   do {
-    var v: Bool = true
+    var v = true
+    expectType(Bool.self, &v)
     expectTrue(v)
   }
 }
@@ -367,10 +369,7 @@ BoolTestSuite.test("CustomStringConvertible") {
 }
 
 BoolTestSuite.test("Equatable,Hashable") {
-  checkHashable(true, false, false)
-  checkHashable(false, false, true)
-  checkHashable(true, true, true)
-
+  checkHashable([false, true], equalityOracle: { $0 == $1 })
   expectNotEqual(false.hashValue, true.hashValue)
 }