[Diagnostics] Add new groups to the 'deprecated' diagnostic group

include/swift/AST/DiagnosticGroups.def

@@ -22,12 +22,8 @@
 
 GROUP(no_group, "")
 
-GROUP(deprecated, "deprecated.md")
-GROUP_LINK(deprecated, availability_deprecated)
-
-GROUP(availability_deprecated, "availability_deprecated.md")
-
-GROUP(unknown_warning_group, "unknown_warning_group.md")
+GROUP(DeprecatedDeclaration, "DeprecatedDeclaration.md")
+GROUP(UnknownWarningGroup, "UnknownWarningGroup.md")
 
 #define UNDEFINE_DIAGNOSTIC_GROUPS_MACROS
 #include "swift/AST/DefineDiagnosticGroupsMacros.h"

include/swift/AST/DiagnosticsFrontend.def

@@ -89,7 +89,7 @@ ERROR(error_missing_arg_value,none,
       (StringRef, unsigned))
 ERROR(error_unknown_arg,none,
       "unknown argument: '%0'", (StringRef))
-GROUPED_WARNING(unknown_warning_group, unknown_warning_group, none,
+GROUPED_WARNING(unknown_warning_group, UnknownWarningGroup, none,
                 "unknown warning group: '%0'", (StringRef))
 ERROR(error_invalid_arg_value,none,
       "invalid value '%1' in '%0'", (StringRef, StringRef))

include/swift/AST/DiagnosticsSema.def

@@ -3134,10 +3134,11 @@ ERROR(witness_unavailable,none,
         "unavailable %kind0 was used to satisfy a requirement of protocol %1%select{|: %2}2",
         (const ValueDecl *, const ProtocolDecl *, StringRef))
 
-WARNING(witness_deprecated,none,
-        "deprecated default implementation is used to satisfy %kind0 required by "
-        "protocol %1%select{|: %2}2",
-        (const ValueDecl *, Identifier, StringRef))
+GROUPED_WARNING(
+    witness_deprecated, DeprecatedDeclaration, none,
+    "deprecated default implementation is used to satisfy %kind0 required by "
+    "protocol %1%select{|: %2}2",
+    (const ValueDecl *, Identifier, StringRef))
 
 WARNING(unavailable_conformance,none,
         "conformance of %0 to protocol %1 is already unavailable",
@@ -6652,14 +6653,14 @@ NOTE(availability_obsoleted, none,
      "%0 was obsoleted in %1 %2",
      (const ValueDecl *, StringRef, llvm::VersionTuple))
 
-GROUPED_WARNING(availability_deprecated, availability_deprecated, Deprecation,
+GROUPED_WARNING(availability_deprecated, DeprecatedDeclaration, Deprecation,
                 "%0 %select{is|%select{is|was}3}1 "
                 "deprecated%select{| in %2%select{| %4}3}1%select{|: %5}5",
                 (const ValueDecl *, bool, StringRef, bool, llvm::VersionTuple,
                  StringRef))
 
 GROUPED_WARNING(
-      availability_deprecated_rename, availability_deprecated, Deprecation,
+      availability_deprecated_rename, DeprecatedDeclaration, Deprecation,
       "%0 %select{is|%select{is|was}3}1 "
       "deprecated%select{| in %2%select{| %4}3}1: "
       "%select{renamed to|replaced by}5%" REPLACEMENT_DECL_KIND_SELECT "6 "
@@ -6837,11 +6838,12 @@ NOTE(conformance_availability_obsoleted, none,
      "conformance of %0 to %1 was obsoleted in %2 %3",
      (Type, Type, StringRef, llvm::VersionTuple))
 
-WARNING(conformance_availability_deprecated, Deprecation,
-        "conformance of %0 to %1 %select{is|%select{is|was}4}2 "
-        "deprecated%select{| in %3%select{| %5}4}2%select{|: %6}6",
-        (Type, Type, bool, StringRef, bool, llvm::VersionTuple,
-         StringRef))
+GROUPED_WARNING(conformance_availability_deprecated,
+                DeprecatedDeclaration, Deprecation,
+                "conformance of %0 to %1 %select{is|%select{is|was}4}2 "
+                "deprecated%select{| in %3%select{| %5}4}2%select{|: %6}6",
+                (Type, Type, bool, StringRef, bool, llvm::VersionTuple,
+                 StringRef))
 
 ERROR(conformance_availability_only_version_newer, none,
       "conformance of %0 to %1 is only available in %2 %3 or newer",
@@ -7107,15 +7109,19 @@ ERROR(override_nsobject_hash_error,none,
       "'NSObject.hash(into:)' is not overridable; "
       "did you mean to override 'NSObject.hash'?", ())
 
-WARNING(hashvalue_implementation,Deprecation,
-        "'Hashable.hashValue' is deprecated as a protocol requirement; "
-        "conform type %0 to 'Hashable' by implementing 'hash(into:)' instead",
-        (Type))
+GROUPED_WARNING(
+    hashvalue_implementation, DeprecatedDeclaration, Deprecation,
+    "'Hashable.hashValue' is deprecated as a protocol requirement; "
+    "conform type %0 to 'Hashable' by implementing 'hash(into:)' instead",
+    (Type))
 
-WARNING(executor_enqueue_deprecated_owned_job_implementation,Deprecation,
-        "'Executor.enqueue(Job)' is deprecated as a protocol requirement; "
-        "conform type %0 to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead",
-        (Type))
+GROUPED_WARNING(
+    executor_enqueue_deprecated_owned_job_implementation,
+    DeprecatedDeclaration, Deprecation,
+    "'Executor.enqueue(Job)' is deprecated as a protocol requirement; "
+    "conform type %0 to 'Executor' by implementing 'func enqueue(ExecutorJob)' "
+    "instead",
+    (Type))
 WARNING(executor_enqueue_unused_implementation, none,
         "'Executor.enqueue(ExecutorJob)' will never be used, due to the presence of "
         "'enqueue(UnownedJob)'",

lib/AST/DiagnosticGroups.cpp

@@ -208,6 +208,10 @@ constexpr bool isGroupInSupergroup() {
       return true;
   return false;
 }
+// Check for isGroupInSupergroup itself
+static_assert(!isGroupInSupergroup<DiagGroupID::no_group,
+                                   DiagGroupID::DeprecatedDeclaration>() &&
+              "Bug in isGroupInSupergroup");
 
 static_assert(!hasCycle(), "Diagnostic groups graph has a cycle!");
 // Sanity check for the "no_group" group
@@ -216,9 +220,15 @@ static_assert(std::get<0>(diagnosticGroupConnections).supergroups.size() == 0,
               "no_group isn't a top-level group");
 static_assert(std::get<0>(diagnosticGroupConnections).subgroups.size() == 0,
               "no_group shouldn't have subgroups");
-// Check groups have expected supergroups
-static_assert(isGroupInSupergroup<DiagGroupID::availability_deprecated,
-                                  DiagGroupID::deprecated>());
+// Check groups have associated diagnostics
+#define CHECK_NOT_EMPTY(Group)                                                 \
+  static_assert(                                                               \
+      std::get<(uint16_t)DiagGroupID::Group>(diagnosticGroupConnections)       \
+              .diagnostics.size() > 0,                                         \
+      "'" #Group "' group shouldn't be empty.");
+CHECK_NOT_EMPTY(DeprecatedDeclaration)
+CHECK_NOT_EMPTY(UnknownWarningGroup)
+#undef CHECK_NOT_EMPTY
 
 } // end namespace validation
 

test/Concurrency/concurrentfunction_capturediagnostics.swift

@@ -90,7 +90,7 @@ func testCaseTrivialValue4() {
                     // expected-note @-8 {{capturing use}}
 }
 
-class Klass: UnsafeSendable { // expected-warning{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead [availability_deprecated]}}
+class Klass: UnsafeSendable { // expected-warning{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead [DeprecatedDeclaration]}}
   var next: Klass? = nil
 }
 func inoutUserKlass(_ k: inout Klass) {}

test/Concurrency/custom_executor_enqueue_availability.swift

@@ -1,7 +1,7 @@
-// RUN: %target-swift-frontend -enable-experimental-move-only %s -emit-sil -o /dev/null -verify
-// RUN: %target-swift-frontend -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
-// RUN: %target-swift-frontend -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
-// RUN: %target-swift-frontend -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
+// RUN: %target-swift-frontend -print-diagnostic-groups -enable-experimental-move-only %s -emit-sil -o /dev/null -verify
+// RUN: %target-swift-frontend -print-diagnostic-groups -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
+// RUN: %target-swift-frontend -print-diagnostic-groups -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
+// RUN: %target-swift-frontend -print-diagnostic-groups -enable-experimental-move-only %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
 
 // REQUIRES: concurrency
 // REQUIRES: OS=macosx
@@ -55,7 +55,7 @@ final class TripleExecutor: SerialExecutor {
 
   // expected-warning@+2{{'Job' is deprecated: renamed to 'ExecutorJob'}}
   // expected-note@+1{{use 'ExecutorJob' instead}}
-  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'TripleExecutor' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead}}
+  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'TripleExecutor' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead [DeprecatedDeclaration]}}
 
   func enqueue(_ job: consuming ExecutorJob) {}
 

test/Concurrency/custom_executor_enqueue_impls.swift

@@ -1,7 +1,7 @@
-// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify %s
-// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=targeted %s
-// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=complete %s
-// RUN: %target-swift-frontend -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation %s
+// RUN: %target-swift-frontend -print-diagnostic-groups -disable-availability-checking -emit-sil -o /dev/null -verify %s
+// RUN: %target-swift-frontend -print-diagnostic-groups -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=targeted %s
+// RUN: %target-swift-frontend -print-diagnostic-groups -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=complete %s
+// RUN: %target-swift-frontend -print-diagnostic-groups -disable-availability-checking -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation %s
 
 // REQUIRES: concurrency
 // REQUIRES: asserts
@@ -41,7 +41,7 @@ final class TripleExecutor: SerialExecutor {
 
   // expected-warning@+2{{'Job' is deprecated: renamed to 'ExecutorJob'}}
   // expected-note@+1{{use 'ExecutorJob' instead}}
-  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'TripleExecutor' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead}}
+  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'TripleExecutor' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead [DeprecatedDeclaration]}}
 
   func enqueue(_ job: consuming ExecutorJob) {}
 
@@ -65,7 +65,7 @@ final class NoneExecutor: SerialExecutor { // expected-error{{type 'NoneExecutor
 final class StillDeprecated: SerialExecutor {
   // expected-warning@+2{{'Job' is deprecated: renamed to 'ExecutorJob'}}
   // expected-note@+1{{use 'ExecutorJob' instead}}
-  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'StillDeprecated' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead}}
+  func enqueue(_ job: __owned Job) {} // expected-warning{{'Executor.enqueue(Job)' is deprecated as a protocol requirement; conform type 'StillDeprecated' to 'Executor' by implementing 'func enqueue(ExecutorJob)' instead [DeprecatedDeclaration]}}
 
   func asUnownedSerialExecutor() -> UnownedSerialExecutor {
     UnownedSerialExecutor(ordinary: self)

test/Sema/availability_literals.swift

@@ -10,8 +10,8 @@ extension SLD: ExpressibleByStringLiteral {
     init(stringLiteral value: StringLiteralType) {}
 }
 
-let _ = SLD(stringLiteral: "") // expected-warning{{'init(stringLiteral:)' is deprecated [availability_deprecated]}}
-let _: SLD = "" // expected-warning{{'init(stringLiteral:)' is deprecated [availability_deprecated]}}
+let _ = SLD(stringLiteral: "") // expected-warning{{'init(stringLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: SLD = "" // expected-warning{{'init(stringLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 
 struct SLU {}
@@ -30,8 +30,8 @@ extension ILD: ExpressibleByIntegerLiteral {
   init(integerLiteral value: IntegerLiteralType) {}
 }
 
-let _ = ILD(integerLiteral: 1) // expected-warning{{'init(integerLiteral:)' is deprecated [availability_deprecated]}}
-let _: ILD = 1 // expected-warning{{'init(integerLiteral:)' is deprecated [availability_deprecated]}}
+let _ = ILD(integerLiteral: 1) // expected-warning{{'init(integerLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: ILD = 1 // expected-warning{{'init(integerLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct ILU {}
 
@@ -51,8 +51,8 @@ extension NLD: ExpressibleByNilLiteral {
   init(nilLiteral: ()) {}
 }
 
-let _: NLD = .init(nilLiteral: ()) // expected-warning{{'init(nilLiteral:)' is deprecated [availability_deprecated]}}
-let _: NLD = nil // expected-warning{{'init(nilLiteral:)' is deprecated [availability_deprecated]}}
+let _: NLD = .init(nilLiteral: ()) // expected-warning{{'init(nilLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: NLD = nil // expected-warning{{'init(nilLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct NLU {}
 
@@ -70,8 +70,8 @@ struct BLD {}
 extension BLD: ExpressibleByBooleanLiteral {
   init(booleanLiteral value: BooleanLiteralType) {}
 }
-let _: BLD = .init(booleanLiteral: false) // expected-warning{{'init(booleanLiteral:)' is deprecated [availability_deprecated]}}
-let _: BLD = false // expected-warning{{'init(booleanLiteral:)' is deprecated [availability_deprecated]}}
+let _: BLD = .init(booleanLiteral: false) // expected-warning{{'init(booleanLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: BLD = false // expected-warning{{'init(booleanLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct BLU {}
 @available(macOS 100, *)
@@ -87,8 +87,8 @@ struct FLD {}
 extension FLD: ExpressibleByFloatLiteral {
   init(floatLiteral value: FloatLiteralType) {}
 }
-let _: FLD = .init(floatLiteral: 0.1) // expected-warning{{'init(floatLiteral:)' is deprecated [availability_deprecated]}}
-let _: FLD = 0.1 // expected-warning{{'init(floatLiteral:)' is deprecated [availability_deprecated]}}
+let _: FLD = .init(floatLiteral: 0.1) // expected-warning{{'init(floatLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: FLD = 0.1 // expected-warning{{'init(floatLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct FLU {}
 @available(macOS 100, *)
@@ -104,8 +104,8 @@ struct ALD {}
 extension ALD: ExpressibleByArrayLiteral {
   init(arrayLiteral elements: Int...) {}
 }
-let _: ALD = .init(arrayLiteral: 1) // expected-warning{{'init(arrayLiteral:)' is deprecated [availability_deprecated]}}
-let _: ALD = [1] // expected-warning{{'init(arrayLiteral:)' is deprecated [availability_deprecated]}}
+let _: ALD = .init(arrayLiteral: 1) // expected-warning{{'init(arrayLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: ALD = [1] // expected-warning{{'init(arrayLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct ALU {}
 @available(macOS 100, *)
@@ -121,8 +121,8 @@ struct DLD {}
 extension DLD: ExpressibleByDictionaryLiteral {
   init(dictionaryLiteral elements: (Int, Int)...) {}
 }
-let _: DLD = .init(dictionaryLiteral: (1,1)) // expected-warning{{'init(dictionaryLiteral:)' is deprecated [availability_deprecated]}}
-let _: DLD = [1: 1] // expected-warning{{'init(dictionaryLiteral:)' is deprecated [availability_deprecated]}}
+let _: DLD = .init(dictionaryLiteral: (1,1)) // expected-warning{{'init(dictionaryLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: DLD = [1: 1] // expected-warning{{'init(dictionaryLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct DLU {}
 @available(macOS 100, *)
@@ -139,8 +139,8 @@ extension USLD: ExpressibleByUnicodeScalarLiteral {
   typealias UnicodeScalarLiteralType = Character
   init(unicodeScalarLiteral value: UnicodeScalarLiteralType) {}
 }
-let _: USLD = .init(unicodeScalarLiteral: "a") // expected-warning{{'init(unicodeScalarLiteral:)' is deprecated [availability_deprecated]}}
-let _: USLD = "a" // expected-warning{{'init(unicodeScalarLiteral:)' is deprecated [availability_deprecated]}}
+let _: USLD = .init(unicodeScalarLiteral: "a") // expected-warning{{'init(unicodeScalarLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: USLD = "a" // expected-warning{{'init(unicodeScalarLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct USLU {}
 @available(macOS 100, *)
@@ -157,8 +157,8 @@ struct GCLD {}
 extension GCLD: ExpressibleByExtendedGraphemeClusterLiteral {
   init(extendedGraphemeClusterLiteral value: Character) {}
 }
-let _: GCLD = .init(extendedGraphemeClusterLiteral: "🇧🇷") // expected-warning{{'init(extendedGraphemeClusterLiteral:)' is deprecated [availability_deprecated]}}
-let _: GCLD = "🇧🇷" // expected-warning{{'init(extendedGraphemeClusterLiteral:)' is deprecated [availability_deprecated]}}
+let _: GCLD = .init(extendedGraphemeClusterLiteral: "🇧🇷") // expected-warning{{'init(extendedGraphemeClusterLiteral:)' is deprecated [DeprecatedDeclaration]}}
+let _: GCLD = "🇧🇷" // expected-warning{{'init(extendedGraphemeClusterLiteral:)' is deprecated [DeprecatedDeclaration]}}
 
 struct GCLU {}
 @available(macOS 100, *)

test/Sema/bitwse_copyable_underscore.swift

@@ -2,6 +2,6 @@
 // RUN:     -disable-availability-checking                   \
 // RUN:     -print-diagnostic-groups
 
-struct S : _BitwiseCopyable {} // expected-warning {{'_BitwiseCopyable' is deprecated: Use BitwiseCopyable [availability_deprecated]}}
+struct S : _BitwiseCopyable {} // expected-warning {{'_BitwiseCopyable' is deprecated: Use BitwiseCopyable [DeprecatedDeclaration]}}
 
-func f<T : _BitwiseCopyable>(_ t: T) {} // expected-warning {{'_BitwiseCopyable' is deprecated: Use BitwiseCopyable [availability_deprecated]}}
+func f<T : _BitwiseCopyable>(_ t: T) {} // expected-warning {{'_BitwiseCopyable' is deprecated: Use BitwiseCopyable [DeprecatedDeclaration]}}