Merge pull request #61994 from tshortli/improve-derived-conformance-diags-for-actors

Sema: Improve derived conformance diagnostics for actors

Author: tshortli

include/swift/AST/Decl.h

@@ -159,10 +159,12 @@ enum class DescriptiveDeclKind : uint8_t {
   Enum,
   Struct,
   Class,
+  Actor,
   Protocol,
   GenericEnum,
   GenericStruct,
   GenericClass,
+  GenericActor,
   GenericType,
   Subscript,
   StaticSubscript,

include/swift/AST/DiagnosticsSema.def

@@ -3211,8 +3211,8 @@ NOTE(missing_member_type_conformance_prevents_synthesis, none,
      "of %3 to %2",
      (unsigned, Type, Type, Type))
 NOTE(automatic_protocol_synthesis_unsupported,none,
-    "automatic synthesis of '%0' is not supported for %select{classes|structs}1",
-    (StringRef, unsigned))
+    "automatic synthesis of '%0' is not supported for %1 declarations",
+    (StringRef, DescriptiveDeclKind))
 NOTE(comparable_synthesis_raw_value_not_allowed, none,
      "enum declares raw type %0, preventing synthesized conformance of %1 to %2", 
      (Type, Type, Type))

lib/AST/Decl.cpp

@@ -180,10 +180,14 @@ DescriptiveDeclKind Decl::getDescriptiveKind() const {
               ? DescriptiveDeclKind::GenericStruct
               : DescriptiveDeclKind::Struct;
 
-   case DeclKind::Class:
+   case DeclKind::Class: {
+     bool isActor = cast<ClassDecl>(this)->isActor();
      return cast<ClassDecl>(this)->getGenericParams()
-              ? DescriptiveDeclKind::GenericClass
-              : DescriptiveDeclKind::Class;
+                ? (isActor ? DescriptiveDeclKind::GenericActor
+                           : DescriptiveDeclKind::GenericClass)
+                : (isActor ? DescriptiveDeclKind::Actor
+                           : DescriptiveDeclKind::Class);
+   }
 
    case DeclKind::Var: {
      auto var = cast<VarDecl>(this);
@@ -317,10 +321,12 @@ StringRef Decl::getDescriptiveKindName(DescriptiveDeclKind K) {
   ENTRY(Enum, "enum");
   ENTRY(Struct, "struct");
   ENTRY(Class, "class");
+  ENTRY(Actor, "actor");
   ENTRY(Protocol, "protocol");
   ENTRY(GenericEnum, "generic enum");
   ENTRY(GenericStruct, "generic struct");
   ENTRY(GenericClass, "generic class");
+  ENTRY(GenericActor, "generic actor");
   ENTRY(GenericType, "generic type");
   ENTRY(Subscript, "subscript");
   ENTRY(StaticSubscript, "static subscript");

lib/Sema/DerivedConformances.cpp

@@ -270,9 +270,9 @@ void DerivedConformance::diagnoseIfSynthesisUnsupportedForDecl(
 
   if (shouldDiagnose) {
     auto &ctx = nominal->getASTContext();
-    ctx.Diags.diagnose(nominal->getLoc(),
-                       diag::automatic_protocol_synthesis_unsupported,
-                       protocol->getName().str(), isa<StructDecl>(nominal));
+    ctx.Diags.diagnose(
+        nominal->getLoc(), diag::automatic_protocol_synthesis_unsupported,
+        protocol->getName().str(), nominal->getDescriptiveKind());
   }
 }
 

test/Concurrency/actor_derived_conformances.swift

@@ -0,0 +1,18 @@
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
+// REQUIRES: concurrency
+
+actor A1: Comparable {}
+// expected-error@-1 {{type 'A1' does not conform to protocol 'Comparable'}}
+// expected-error@-2 {{type 'A1' does not conform to protocol 'Equatable'}}
+// expected-note@-3 {{automatic synthesis of 'Comparable' is not supported for actor declarations}}
+// expected-note@-4 {{automatic synthesis of 'Equatable' is not supported for actor declarations}}
+
+actor A2: Equatable {}
+// expected-error@-1 {{type 'A2' does not conform to protocol 'Equatable'}}
+// expected-note@-2 {{automatic synthesis of 'Equatable' is not supported for actor declarations}}
+
+actor A3: Hashable {}
+// expected-error@-1 {{type 'A3' does not conform to protocol 'Hashable'}}
+// expected-error@-2 {{type 'A3' does not conform to protocol 'Equatable'}}
+// expected-note@-3 {{automatic synthesis of 'Hashable' is not supported for actor declarations}}
+// expected-note@-4 {{automatic synthesis of 'Equatable' is not supported for actor declarations}}

test/Distributed/distributed_actor_derived_conformances.swift

@@ -0,0 +1,14 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -disable-availability-checking %S/Inputs/FakeDistributedActorSystems.swift
+// RUN: %target-typecheck-verify-swift -disable-availability-checking -I %t
+// REQUIRES: concurrency
+// REQUIRES: distributed
+
+import Distributed
+import FakeDistributedActorSystems
+
+typealias DefaultDistributedActorSystem = FakeActorSystem
+
+distributed actor DA: Comparable {}
+// expected-error@-1 {{type 'DA' does not conform to protocol 'Comparable'}}
+// expected-note@-2 {{automatic synthesis of 'Comparable' is not supported for actor declarations}}

test/Sema/classes_equatable_hashable.swift

@@ -1,8 +1,8 @@
 // RUN: %target-swift-frontend -typecheck -verify -primary-file %s
 
 class Foo: Equatable {} 
-// expected-error@-1 {{type 'Foo' does not conform to protocol 'Equatable'}} expected-note@-1 {{automatic synthesis of 'Equatable' is not supported for classes}}
+// expected-error@-1 {{type 'Foo' does not conform to protocol 'Equatable'}} expected-note@-1 {{automatic synthesis of 'Equatable' is not supported for class declarations}}
 
 class Bar: Hashable {} 
-// expected-error@-1 {{type 'Bar' does not conform to protocol 'Hashable'}} expected-note@-1 {{automatic synthesis of 'Hashable' is not supported for classes}}
-// expected-error@-2 {{type 'Bar' does not conform to protocol 'Equatable'}} expected-note@-2 {{automatic synthesis of 'Equatable' is not supported for classes}}
+// expected-error@-1 {{type 'Bar' does not conform to protocol 'Hashable'}} expected-note@-1 {{automatic synthesis of 'Hashable' is not supported for class declarations}}
+// expected-error@-2 {{type 'Bar' does not conform to protocol 'Equatable'}} expected-note@-2 {{automatic synthesis of 'Equatable' is not supported for class declarations}}

test/decl/protocol/special/comparable/comparable_unsupported.swift

@@ -4,15 +4,15 @@
 
 struct NotComparableStruct: Comparable {
   // expected-error@-1 {{type 'NotComparableStruct' does not conform to protocol 'Comparable'}}
-  // expected-note@-2 {{automatic synthesis of 'Comparable' is not supported for structs}}
+  // expected-note@-2 {{automatic synthesis of 'Comparable' is not supported for struct declarations}}
   var value = 0
 }
 
 class NotComparableClass: Comparable {
   // expected-error@-1 {{type 'NotComparableClass' does not conform to protocol 'Comparable'}}
-  // expected-note@-2 {{automatic synthesis of 'Comparable' is not supported for classes}}
+  // expected-note@-2 {{automatic synthesis of 'Comparable' is not supported for class declarations}}
   // expected-error@-3 {{type 'NotComparableClass' does not conform to protocol 'Equatable'}}
-  // expected-note@-4 {{automatic synthesis of 'Equatable' is not supported for classes}}
+  // expected-note@-4 {{automatic synthesis of 'Equatable' is not supported for class declarations}}
   var value = 1
 }