Author: Aaron Ballman Date: 2021-03-17T07:52:34-04:00 New Revision: ecfa87453113dad6bd9430606a06f7ab728cc21b
URL: https://github.com/llvm/llvm-project/commit/ecfa87453113dad6bd9430606a06f7ab728cc21b DIFF: https://github.com/llvm/llvm-project/commit/ecfa87453113dad6bd9430606a06f7ab728cc21b.diff LOG: Update diagnostic groups for pre-compat warnings As a follow-up to D95691, add new diagnostic groups named pre-c++N-compat to replace the old diagnostic groups with the standards listed out explicitly. The old group names are retained for backwards compatibility. Added: Modified: clang/include/clang/Basic/DiagnosticGroups.td clang/test/Parser/static_assert.c clang/test/SemaCXX/cxx98-compat-pedantic.cpp clang/test/SemaCXX/inline.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 34876e9945b5..291cca02694f 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -253,22 +253,30 @@ def : DiagGroup<"c++1z-compat-mangling", [CXX17CompatMangling]>; // Name of this warning in GCC. def NoexceptType : DiagGroup<"noexcept-type", [CXX17CompatMangling]>; -// Warnings for C2x code which is not compatible with prior C standards. +// Warnings for C code which is not compatible with previous C standards. def CPre2xCompat : DiagGroup<"pre-c2x-compat">; def CPre2xCompatPedantic : DiagGroup<"pre-c2x-compat-pedantic", [CPre2xCompat]>; -// Warnings for C++1y code which is not compatible with prior C++ standards. -def CXXPre14Compat : DiagGroup<"c++98-c++11-compat">; -def CXXPre14CompatPedantic : DiagGroup<"c++98-c++11-compat-pedantic", +// Warnings for C++ code which is not compatible with previous C++ standards. +def CXXPre14Compat : DiagGroup<"pre-c++14-compat">; +def : DiagGroup<"c++98-c++11-compat", [CXXPre14Compat]>; +def CXXPre14CompatPedantic : DiagGroup<"pre-c++14-compat-pedantic", [CXXPre14Compat, CXXPre14CompatBinaryLiteral]>; -def CXXPre17Compat : DiagGroup<"c++98-c++11-c++14-compat">; -def CXXPre17CompatPedantic : DiagGroup<"c++98-c++11-c++14-compat-pedantic", +def : DiagGroup<"c++98-c++11-compat-pedantic", [CXXPre14CompatPedantic]>; +def CXXPre17Compat : DiagGroup<"pre-c++17-compat">; +def : DiagGroup<"c++98-c++11-c++14-compat", [CXXPre17Compat]>; +def CXXPre17CompatPedantic : DiagGroup<"pre-c++17-compat-pedantic", [CXXPre17Compat]>; -def CXXPre20Compat : DiagGroup<"c++98-c++11-c++14-c++17-compat">; -def CXXPre20CompatPedantic : DiagGroup<"c++98-c++11-c++14-c++17-compat-pedantic", +def : DiagGroup<"c++98-c++11-c++14-compat-pedantic", + [CXXPre17CompatPedantic]>; +def CXXPre20Compat : DiagGroup<"pre-c++20-compat">; +def : DiagGroup<"c++98-c++11-c++14-c++17-compat", [CXXPre20Compat]>; +def CXXPre20CompatPedantic : DiagGroup<"pre-c++20-compat-pedantic", [CXXPre20Compat]>; +def : DiagGroup<"c++98-c++11-c++14-c++17-compat-pedantic", + [CXXPre20CompatPedantic]>; def CXXPre2bCompat : DiagGroup<"pre-c++2b-compat">; def CXXPre2bCompatPedantic : DiagGroup<"pre-c++2b-compat-pedantic", [CXXPre2bCompat]>; diff --git a/clang/test/Parser/static_assert.c b/clang/test/Parser/static_assert.c index eaae2adbe380..452c404a79ce 100644 --- a/clang/test/Parser/static_assert.c +++ b/clang/test/Parser/static_assert.c @@ -7,7 +7,7 @@ // RUN: %clang_cc1 -fsyntax-only -std=c++17 -pedantic -verify=cxx17-pedantic -x c++ %s // RUN: %clang_cc1 -fsyntax-only -std=c++98 -verify=cxx98 -x c++ %s // RUN: %clang_cc1 -fsyntax-only -std=c++98 -pedantic -verify=cxx98-pedantic -x c++ %s -// RUN: %clang_cc1 -fsyntax-only -std=c++17 -Wc++98-c++11-c++14-compat -verify=cxx17-compat -x c++ %s +// RUN: %clang_cc1 -fsyntax-only -std=c++17 -Wpre-c++17-compat -verify=cxx17-compat -x c++ %s // cxx17-no-diagnostics diff --git a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp index c72c44ad5feb..74aa890b8c62 100644 --- a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp +++ b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp @@ -4,7 +4,7 @@ // RUN: %clang_cc1 -fsyntax-only -std=c++11 -Wc++98-compat -Werror %s // RUN: %clang_cc1 -fsyntax-only -std=c++98 -Werror %s -DCXX98 -// RUN: %clang_cc1 -fsyntax-only -std=c++1y -Wc++98-compat-pedantic -verify %s -Wno-c++98-c++11-compat-pedantic -DCXX1Y2 +// RUN: %clang_cc1 -fsyntax-only -std=c++1y -Wc++98-compat-pedantic -verify %s -Wno-pre-c++14-compat-pedantic -DCXX1Y2 // -Wc++98-compat-pedantic warns on C++11 features which we accept without a // warning in C++98 mode. diff --git a/clang/test/SemaCXX/inline.cpp b/clang/test/SemaCXX/inline.cpp index ba29521ce504..1a13609eb578 100644 --- a/clang/test/SemaCXX/inline.cpp +++ b/clang/test/SemaCXX/inline.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s // RUN: %clang_cc1 -fsyntax-only -verify -std=c++14 %s -// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 %s -Wc++98-c++11-c++14-compat +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 %s -Wpre-c++17-compat // Check that we don't allow illegal uses of inline // (checking C++-only constructs here) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
