reduce testsuite dependence on the Boolean protocol.

Author: lattner

test/1_stdlib/DarwinAPI.swift

@@ -49,10 +49,9 @@ DarwinBooleanAPI.test("boolValue/extra values") {
 
 DarwinBooleanAPI.test("Boolean") {
   var trueValue: DarwinBoolean = true
-  expectIsBooleanType(&trueValue)
 
   var success = false
-  if trueValue {
+  if trueValue.boolValue {
     success = true
   } else {
     expectUnreachable()
@@ -89,20 +88,20 @@ DarwinBooleanAPI.test("&&") {
   let trueValue: DarwinBoolean = true
   let falseValue: DarwinBoolean = false
 
-  expectTrue(trueValue && trueValue)
-  expectFalse(trueValue && falseValue)
-  expectFalse(falseValue && trueValue)
-  expectFalse(falseValue && falseValue)
+  expectTrue(trueValue.boolValue && trueValue.boolValue)
+  expectFalse(trueValue.boolValue && falseValue.boolValue)
+  expectFalse(falseValue.boolValue && trueValue.boolValue)
+  expectFalse(falseValue.boolValue && falseValue.boolValue)
 }
 
 DarwinBooleanAPI.test("||") {
   let trueValue: DarwinBoolean = true
   let falseValue: DarwinBoolean = false
 
-  expectTrue(trueValue || trueValue)
-  expectTrue(trueValue || falseValue)
-  expectTrue(falseValue || trueValue)
-  expectFalse(falseValue || falseValue)
+  expectTrue(trueValue.boolValue || trueValue.boolValue)
+  expectTrue(trueValue.boolValue || falseValue.boolValue)
+  expectTrue(falseValue.boolValue || trueValue.boolValue)
+  expectFalse(falseValue.boolValue || falseValue.boolValue)
 }
 
 var DarwinIoctlConstants = TestSuite("DarwinIoctlConstants")

test/1_stdlib/LogicValue.swift

@@ -18,7 +18,7 @@ test_CBool()
 
 func test_ObjCBool() {
   let x = ObjCBool(true)
-  let hash = testHash(Bool(x))
+  let hash = testHash(x.boolValue)
   print("ObjCBool: hash = \(hash)")
 }
 // CHECK-NEXT: ObjCBool: hash = 1

test/Interpreter/SDK/equatable_hashable.swift

@@ -217,14 +217,6 @@ func != <T>(lhs : T, rhs : NoneType) -> Bool { // expected-error{{invalid redecl
   return true
 }
 
-// <rdar://problem/15082356>
-func &&(lhs: Boolean, rhs: @autoclosure () -> Boolean) -> Bool { // expected-note{{previously declared}}
-  return lhs.boolValue && rhs().boolValue
-}
-
-func &&(lhs: Boolean, rhs: @autoclosure () -> Boolean) -> Bool { // expected-error{{invalid redeclaration of '&&'}}
-  return lhs.boolValue || rhs().boolValue
-}
 
 // throws
 func throwsFunc(code: Int) { } // expected-note{{previously declared}}