Sema: Use diagnoseOrDefer() in ConformanceChecker::ensureRequirementsAreSatisfied()

Author: slavapestov

lib/Sema/TypeCheckProtocol.cpp

@@ -5110,20 +5110,19 @@ void ConformanceChecker::ensureRequirementsAreSatisfied() {
     // Diagnose the failure generically.
     // FIXME: Would be nice to give some more context here!
     if (!Conformance->isInvalid()) {
-      diags.diagnose(Loc, diag::type_does_not_conform,
-                     Adoptee,
-                     Proto->getDeclaredInterfaceType());
-
       if (result.getKind() == CheckRequirementsResult::RequirementFailure) {
-        TypeChecker::diagnoseRequirementFailure(
-            result.getRequirementFailureInfo(), Loc, Loc,
-            proto->getDeclaredInterfaceType(),
-            {proto->getSelfInterfaceType()->castTo<GenericTypeParamType>()},
-            QuerySubstitutionMap{substitutions}, module);
+        auto Loc = this->Loc;
+        diagnoseOrDefer(nullptr, /*isError=*/true,
+          [Loc, result, proto, substitutions, module](NormalProtocolConformance *conformance) {
+            TypeChecker::diagnoseRequirementFailure(
+              result.getRequirementFailureInfo(), Loc, Loc,
+              proto->getDeclaredInterfaceType(),
+              {proto->getSelfInterfaceType()->castTo<GenericTypeParamType>()},
+              QuerySubstitutionMap{substitutions}, module);
+          });
       }
 
       Conformance->setInvalid();
-      AlreadyComplained = true;
     }
     return;
   }

test/Distributed/distributed_actor_system_missing.swift

@@ -7,7 +7,7 @@
 import Distributed
 
 distributed actor DA {
-  // expected-error@-1{{distributed actor 'DA' does not declare ActorSystem it can be used with.}}
+  // expected-error@-1{{distributed actor 'DA' does not declare ActorSystem it can be used with}}
 
   // Since synthesis would have failed due to the missing ActorSystem:
   // expected-error@-4{{type 'DA' does not conform to protocol 'Encodable'}}
@@ -23,7 +23,7 @@ distributed actor DA {
 // we need to fail gracefully, rather than crash trying to use the non-existing type.
 //
 // Test case for: https://github.com/apple/swift/issues/58663
-distributed actor Server { // expected-error 2 {{distributed actor 'Server' does not declare ActorSystem it can be used with.}}
+distributed actor Server { // expected-error 2 {{distributed actor 'Server' does not declare ActorSystem it can be used with}}
   // expected-note@-1{{you can provide a module-wide default actor system by declaring:}}
   typealias ActorSystem = DoesNotExistDataSystem
   // expected-error@-1{{cannot find type 'DoesNotExistDataSystem' in scope}}

test/Distributed/distributed_actor_system_missing_type_dontCrash.swift

@@ -8,8 +8,8 @@ import Distributed
 
 // rdar://90886302 This test would crash if not typealias ActorSystem was declared for an actor
 distributed actor Fish {
-  // expected-error@-1{{distributed actor 'Fish' does not declare ActorSystem it can be used with.}}
-  // expected-error@-2{{distributed actor 'Fish' does not declare ActorSystem it can be used with.}}
+  // expected-error@-1{{distributed actor 'Fish' does not declare ActorSystem it can be used with}}
+  // expected-error@-2{{distributed actor 'Fish' does not declare ActorSystem it can be used with}}
   // expected-note@-3{{you can provide a module-wide default actor system by declaring:\ntypealias DefaultDistributedActorSystem = <#ConcreteActorSystem#>}}
 
   distributed func tell(_ text: String, by: Fish) {

test/Distributed/distributed_protocols_distributed_func_serialization_requirements.swift

@@ -47,11 +47,10 @@ protocol ProtocolWithChecksSeqReq: DistributedActor
   distributed func testAT() async throws -> NotCodable
 }
 distributed actor ProtocolWithChecksSeqReqDA_MissingSystem: ProtocolWithChecksSeqReq {
-  // expected-error@-1{{distributed actor 'ProtocolWithChecksSeqReqDA_MissingSystem' does not declare ActorSystem it can be used with.}}
+  // expected-error@-1{{distributed actor 'ProtocolWithChecksSeqReqDA_MissingSystem' does not declare ActorSystem it can be used with}}
   // expected-note@-2{{you can provide a module-wide default actor system by declaring:}}
-  // expected-error@-3{{type 'ProtocolWithChecksSeqReqDA_MissingSystem' does not conform to protocol 'ProtocolWithChecksSeqReq'}}
   //
-  // expected-error@-5{{distributed actor 'ProtocolWithChecksSeqReqDA_MissingSystem' does not declare ActorSystem it can be used with.}}
+  // expected-error@-4{{distributed actor 'ProtocolWithChecksSeqReqDA_MissingSystem' does not declare ActorSystem it can be used with}}
 
   // Entire conformance is doomed, so we didn't proceed to checking the functions; that's fine
   distributed func testAT() async throws -> NotCodable { .init() }

test/decl/protocol/req/associated_type_inference.swift

@@ -572,8 +572,7 @@ protocol P35a {
   associatedtype B // expected-note {{protocol requires nested type 'B'}}
 }
 protocol P35b: P35a where B == A {}
-// expected-error@+2 {{type 'S35' does not conform to protocol 'P35a'}}
-// expected-error@+1 {{type 'S35' does not conform to protocol 'P35b'}}
+// expected-error@+1 {{type 'S35' does not conform to protocol 'P35a'}}
 struct S35: P35b {}
 
 // Circular reference through a value witness.
@@ -634,7 +633,6 @@ protocol P40b: P40a {
 protocol P40c: P40b where D == S40<Never> {}
 struct S40<E: Equatable>: P40c {
   // expected-error@-1 {{type 'S40<E>' does not conform to protocol 'P40b'}}
-  // expected-error@-2 {{type 'S40<E>' does not conform to protocol 'P40c'}}
   func foo(arg: Never) {}
 
   typealias B = Self
@@ -712,6 +710,5 @@ protocol FIXME_P1a {
   associatedtype B: FIXME_P1a // expected-note {{protocol requires nested type 'B'}}
 }
 protocol FIXME_P1b: FIXME_P1a where B == FIXME_S1<A> {}
-// expected-error@+2 {{type 'FIXME_S1<T>' does not conform to protocol 'FIXME_P1a'}}
-// expected-error@+1 {{type 'FIXME_S1<T>' does not conform to protocol 'FIXME_P1b'}}
+// expected-error@+1 {{type 'FIXME_S1<T>' does not conform to protocol 'FIXME_P1a'}}
 struct FIXME_S1<T: Equatable>: FIXME_P1b {}

test/decl/protocol/req/associated_type_inference_fixed_type.swift

@@ -108,9 +108,8 @@ protocol Q11 {
 }
 do {
   struct Conformer: Q11, P11b {}
-  // expected-error@-1 {{type 'Conformer' does not conform to protocol 'P11b'}}
-  // expected-error@-2 {{type 'Conformer' does not conform to protocol 'P11a'}}
-  // expected-error@-3 {{type 'Conformer' does not conform to protocol 'Q11'}}
+  // expected-error@-1 {{type 'Conformer' does not conform to protocol 'P11a'}}
+  // expected-error@-2 {{type 'Conformer' does not conform to protocol 'Q11'}}
 }
 
 protocol P12 where A == B {
@@ -151,7 +150,6 @@ protocol P15b: P15a where A == B {}
 do {
   struct Conformer: P15b {}
   // expected-error@-1 {{type 'Conformer' does not conform to protocol 'P15a'}}
-  // expected-error@-2 {{type 'Conformer' does not conform to protocol 'P15b'}}
 }
 
 protocol P16a where A == B {

test/decl/protocol/req/associated_type_inference_fixed_type_experimental_inference.swift

@@ -885,5 +885,4 @@ do {
   struct Conformer: P48c {}
   // expected-error@-1 {{type 'Conformer' does not conform to protocol 'P48a'}}
   // expected-error@-2 {{type 'Conformer' does not conform to protocol 'P48b'}}
-  // expected-error@-3 {{type 'Conformer' does not conform to protocol 'P48c'}}
 }