Author: Hans Wennborg Date: 2025-05-28T23:03:10+02:00 New Revision: f20423f496e9ceb340a3c11b54d6a7ff7e74f2bc
URL: https://github.com/llvm/llvm-project/commit/f20423f496e9ceb340a3c11b54d6a7ff7e74f2bc DIFF: https://github.com/llvm/llvm-project/commit/f20423f496e9ceb340a3c11b54d6a7ff7e74f2bc.diff LOG: [clang] Rename -Wdeprecated-switch-case to -Wdeprecated-declarations-switch-case (#141779) To make it more clear that it's a subset of -Wdeprecated-declarations. Follow-up to #138562 Added: Modified: clang/docs/ReleaseNotes.rst clang/include/clang/Basic/DiagnosticGroups.td clang/include/clang/Basic/DiagnosticSemaKinds.td clang/test/Sema/switch-availability.c Removed: ################################################################################ diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index b21b683fb1360..540552bc47e8d 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -575,7 +575,8 @@ Improvements to Clang's diagnostics - ``-Wswitch`` will now diagnose unhandled enumerators in switches also when the enumerator is deprecated. Warnings about using deprecated enumerators in - switch cases have moved behind a new ``-Wdeprecated-switch-case`` flag. + switch cases have moved behind a new ``-Wdeprecated-declarations-switch-case`` + flag. For example: @@ -598,7 +599,7 @@ Improvements to Clang's diagnostics The warning can be fixed either by adding a ``default:``, or by adding ``case Blue:``. Since the enumerator is deprecated, the latter approach will trigger a ``'Blue' is deprecated`` warning, which can be turned off with - ``-Wno-deprecated-switch-case``. + ``-Wno-deprecated-declarations-switch-case``. Improvements to Clang's time-trace ---------------------------------- diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index ff1dfc3e40d1a..abb5cefb1d2bb 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -234,8 +234,8 @@ def DeprecatedCopyWithDtor : DiagGroup<"deprecated-copy-with-dtor", [DeprecatedC def DeprecatedLiteralOperator : DiagGroup<"deprecated-literal-operator">; // For compatibility with GCC. def : DiagGroup<"deprecated-copy-dtor", [DeprecatedCopyWithDtor]>; -def DeprecatedSwitchCase : DiagGroup<"deprecated-switch-case">; -def DeprecatedDeclarations : DiagGroup<"deprecated-declarations", [DeprecatedSwitchCase]>; +def DeprecatedDeclarationsSwitchCase : DiagGroup<"deprecated-declarations-switch-case">; +def DeprecatedDeclarations : DiagGroup<"deprecated-declarations", [DeprecatedDeclarationsSwitchCase]>; def DeprecatedRedundantConstexprStaticDef : DiagGroup<"deprecated-redundant-constexpr-static-def">; def UnavailableDeclarations : DiagGroup<"unavailable-declarations">; def UnguardedAvailabilityNew : DiagGroup<"unguarded-availability-new">; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 11bd7a8edfd72..8a879f7ca5529 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -6065,7 +6065,7 @@ def err_undeclared_use : Error<"use of undeclared %0">; def warn_deprecated : Warning<"%0 is deprecated">, InGroup<DeprecatedDeclarations>; def warn_deprecated_switch_case : Warning<warn_deprecated.Summary>, - InGroup<DeprecatedSwitchCase>; + InGroup<DeprecatedDeclarationsSwitchCase>; def note_from_diagnose_if : Note<"from 'diagnose_if' attribute on %0:">; def warn_property_method_deprecated : Warning<"property access is using %0 method which is deprecated">, diff --git a/clang/test/Sema/switch-availability.c b/clang/test/Sema/switch-availability.c index 517b3f100b24c..6077790910fda 100644 --- a/clang/test/Sema/switch-availability.c +++ b/clang/test/Sema/switch-availability.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -verify -Wswitch -Wreturn-type -triple x86_64-apple-macosx10.12 %s -// RUN: %clang_cc1 -verify -Wswitch -Wreturn-type -Wno-deprecated-switch-case -DNO_DEPRECATED_CASE -triple x86_64-apple-macosx10.12 %s +// RUN: %clang_cc1 -verify -Wswitch -Wreturn-type -Wno-deprecated-declarations-switch-case -DNO_DEPRECATED_CASE -triple x86_64-apple-macosx10.12 %s enum SwitchOne { Unavail __attribute__((availability(macos, unavailable))), _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
