Merge pull request #32933 from xedin/rdar-65688291

xedin · web-flow · commit 500929febd23 · 2020-07-17T10:45:27.000-07:00
[TypeChecker] NFC: Adjust flaky ambiguous operator diagnostic (rdar:/…
diff --git a/test/Constraints/diagnostics.swift b/test/Constraints/diagnostics.swift
@@ -687,7 +687,9 @@ enum AssocTest {
   case one(Int)
 }
 
-if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{referencing operator function '==' on 'Equatable' requires that 'AssocTest' conform to 'Equatable'}}
+// FIXME(rdar://problem/65688291) - on iOS simulator this diagnostic is flaky,
+// either `referencing operator function '==' on 'Equatable'` or `operator function '==' requires`
+if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{requires that 'AssocTest' conform to 'Equatable'}}
 // expected-note @-1 {{binary operator '==' cannot be synthesized for enums with associated values}}
 
 

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,9 @@ enum AssocTest {`
`687`	`687`	`case one(Int)`
`688`	`688`	`}`
`689`	`689`
`690`		`-if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{referencing operator function '==' on 'Equatable' requires that 'AssocTest' conform to 'Equatable'}}`
	`690`	`+// FIXME(rdar://problem/65688291) - on iOS simulator this diagnostic is flaky,`
	`691`	+// either `referencing operator function '==' on 'Equatable'` or `operator function '==' requires`
	`692`	`+if AssocTest.one(1) == AssocTest.one(1) {} // expected-error{{requires that 'AssocTest' conform to 'Equatable'}}`
`691`	`693`	`// expected-note @-1 {{binary operator '==' cannot be synthesized for enums with associated values}}`
`692`	`694`
`693`	`695`