c++: Fix pragma suppression of -Wc++20-compat diagnostics [PR106423]
Gcc's '#pragma GCC diagnostic' directives are processed in "early mode" (see handle_pragma_diagnostic_early) for the C++ frontend and, as such, require that the target diagnostic option be enabled for the preprocessor (see c_option_is_from_cpp_diagnostics). This change modifies the -Wc++20-compat option definition to register it as a preprocessor option so that its associated diagnostics can be suppressed. The changes also implicitly disable the option in C++20 and later modes. These changes are consistent with the definition of the -Wc++11-compat option. This support is motivated by the need to suppress the following diagnostic otherwise issued in C++17 and earlier modes due to the char8_t typedef present in the uchar.h header file in glibc 2.36. warning: identifier ‘char8_t’ is a keyword in C++20 [-Wc++20-compat] Tests are added to validate suppression of both -Wc++11-compat and -Wc++20-compat related diagnostics (fixes were only needed for the C++20 case). PR c++/106423 gcc/c-family/ChangeLog: * c-opts.cc (c_common_post_options): Disable -Wc++20-compat diagnostics in C++20 and later. * c.opt (Wc++20-compat): Enable hooks for the preprocessor. gcc/cp/ChangeLog: * parser.cc (cp_lexer_saving_tokens): Add comment regarding diagnostic requirements. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/keywords2.C: New test. * g++.dg/cpp2a/keywords2.C: New test. libcpp/ChangeLog: * include/cpplib.h (cpp_warning_reason): Add CPP_W_CXX20_COMPAT. * init.cc (cpp_create_reader): Add cpp_warn_cxx20_compat.
This commit is contained in:
parent
9580ab573d
commit
60468d6cd4
7 changed files with 46 additions and 2 deletions
|
@ -547,6 +547,9 @@ struct cpp_options
|
|||
/* True if warn about differences between C++98 and C++11. */
|
||||
bool cpp_warn_cxx11_compat;
|
||||
|
||||
/* True if warn about differences between C++17 and C++20. */
|
||||
bool cpp_warn_cxx20_compat;
|
||||
|
||||
/* Nonzero if bidirectional control characters checking is on. See enum
|
||||
cpp_bidirectional_level. */
|
||||
unsigned char cpp_warn_bidirectional;
|
||||
|
@ -655,6 +658,7 @@ enum cpp_warning_reason {
|
|||
CPP_W_C90_C99_COMPAT,
|
||||
CPP_W_C11_C2X_COMPAT,
|
||||
CPP_W_CXX11_COMPAT,
|
||||
CPP_W_CXX20_COMPAT,
|
||||
CPP_W_EXPANSION_TO_DEFINED,
|
||||
CPP_W_BIDIRECTIONAL
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue