From 171502174613ec1709b2bd16b8e2f5ffa26996fd Mon Sep 17 00:00:00 2001 From: Pavel Yaskevich Date: Sat, 27 Jun 2020 11:36:48 -0700 Subject: [PATCH] [TypeChecker] NFC: Clarify flaky diagnostic XFAIL Instead of XFAILing whole `test/Constraints/operator.swift` let's adjust diagnostic responsible for flakiness. --- test/Constraints/operator.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Constraints/operator.swift b/test/Constraints/operator.swift index 389a2e5d4a855..4be7e87ba780e 100644 --- a/test/Constraints/operator.swift +++ b/test/Constraints/operator.swift @@ -1,4 +1,3 @@ -// REQUIRES: rdar64844584 // RUN: %target-typecheck-verify-swift // Test constraint simplification of chains of binary operators. @@ -217,11 +216,13 @@ func rdar46459603() { let e = E.foo(value: "String") var arr = ["key": e] + // FIXME(rdar://problem/64844584) - on iOS simulator this diagnostic is flaky, + // either `referencing operator function '==' on 'Equatable'` or `operator function '==' requires` _ = arr.values == [e] - // expected-error@-1 {{referencing operator function '==' on 'Equatable' requires that 'Dictionary.Values' conform to 'Equatable'}} + // expected-error@-1 {{requires that 'Dictionary.Values' conform to 'Equatable'}} // expected-error@-2 {{cannot convert value of type '[E]' to expected argument type 'Dictionary.Values'}} _ = [arr.values] == [[e]] - // expected-error@-1 {{referencing operator function '==' on 'Array' requires that 'Dictionary.Values' conform to 'Equatable'}} + // expected-error@-1 {{requires that 'Dictionary.Values' conform to 'Equatable'}} // expected-error@-2 {{cannot convert value of type '[E]' to expected element type 'Dictionary.Values'}} }