Merge pull request #12655 from rjmccall/emergency-test-fix

swift-ci · web-flow · commit e7e15333fa28 · 2017-10-26T23:55:19.000-07:00
diff --git a/test/SILGen/objc_properties.swift b/test/SILGen/objc_properties.swift
@@ -253,6 +253,6 @@ class HasLazyProperty : NSObject, HasProperty {
 //   which can cause fits for SILGenApply the way it's currently implemented.
 // CHECK-LABEL: sil hidden @_T015objc_properties26testPropSetWithPreposition
 func testPropSetWithPreposition(object: ObjectWithSplitProperty?) {
-  // CHECK: #ObjectWithSplitProperty.flagForSomething!setter.1.foreign : (ObjectWithSplitProperty) -> (Bool) -> (), $@convention(objc_method) (ObjCBool, ObjectWithSplitProperty) -> ()
+  // CHECK: #ObjectWithSplitProperty.flagForSomething!setter.1.foreign : (ObjectWithSplitProperty) -> (Bool) -> (), $@convention(objc_method) ({{Bool|ObjCBool}}, ObjectWithSplitProperty) -> ()
   object?.flagForSomething = false
 }

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,6 @@ class HasLazyProperty : NSObject, HasProperty {`
`253`	`253`	`// which can cause fits for SILGenApply the way it's currently implemented.`
`254`	`254`	`// CHECK-LABEL: sil hidden @_T015objc_properties26testPropSetWithPreposition`
`255`	`255`	`func testPropSetWithPreposition(object: ObjectWithSplitProperty?) {`
`256`		`- // CHECK: #ObjectWithSplitProperty.flagForSomething!setter.1.foreign : (ObjectWithSplitProperty) -> (Bool) -> (), $@convention(objc_method) (ObjCBool, ObjectWithSplitProperty) -> ()`
	`256`	`+ // CHECK: #ObjectWithSplitProperty.flagForSomething!setter.1.foreign : (ObjectWithSplitProperty) -> (Bool) -> (), $@convention(objc_method) ({{Bool\|ObjCBool}}, ObjectWithSplitProperty) -> ()`
`257`	`257`	`object?.flagForSomething = false`
`258`	`258`	`}`