diff options
| author | Lewis Hyatt <lhyatt@gmail.com> | 2023-10-18 12:37:08 -0400 |
|---|---|---|
| committer | Lewis Hyatt <lhyatt@gmail.com> | 2023-10-19 09:09:39 -0400 |
| commit | 19cc4b9d74940f29c961e2a5a8b1fa84992d3d30 (patch) | |
| tree | 97c1b13ccbb61ad0667d4238047bf4dc208b0731 | |
| parent | 202a214d6859d91af5a95aa989321c5d2173c40a (diff) | |
| download | gcc-19cc4b9d74940f29c961e2a5a8b1fa84992d3d30.zip gcc-19cc4b9d74940f29c961e2a5a8b1fa84992d3d30.tar.gz gcc-19cc4b9d74940f29c961e2a5a8b1fa84992d3d30.tar.bz2 | |
c++: Make -Wunknown-pragmas controllable by #pragma GCC diagnostic [PR89038]
As noted on the PR, commit r13-1544, the fix for PR53431, did not handle
the specific case of -Wunknown-pragmas, because that warning is issued
during preprocessing, but not by libcpp directly (it comes from the
cb_def_pragma callback). Address that by handling this pragma in
addition to libcpp pragmas during the early pragma handler.
gcc/c-family/ChangeLog:
PR c++/89038
* c-pragma.cc (handle_pragma_diagnostic_impl): Handle
-Wunknown-pragmas during early processing.
gcc/testsuite/ChangeLog:
PR c++/89038
* c-c++-common/cpp/Wunknown-pragmas-1.c: New test.
| -rw-r--r-- | gcc/c-family/c-pragma.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/Wunknown-pragmas-1.c | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/c-family/c-pragma.cc b/gcc/c-family/c-pragma.cc index 293311d..98dfb0f 100644 --- a/gcc/c-family/c-pragma.cc +++ b/gcc/c-family/c-pragma.cc @@ -963,7 +963,8 @@ handle_pragma_diagnostic_impl () /* option_string + 1 to skip the initial '-' */ unsigned int option_index = find_opt (data.option_str + 1, lang_mask); - if (early && !c_option_is_from_cpp_diagnostics (option_index)) + if (early && !(c_option_is_from_cpp_diagnostics (option_index) + || option_index == OPT_Wunknown_pragmas)) return; if (option_index == OPT_SPECIAL_unknown) diff --git a/gcc/testsuite/c-c++-common/cpp/Wunknown-pragmas-1.c b/gcc/testsuite/c-c++-common/cpp/Wunknown-pragmas-1.c new file mode 100644 index 0000000..fb58739 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/Wunknown-pragmas-1.c @@ -0,0 +1,13 @@ +/* PR c++/89038 */ +/* { dg-additional-options "-Wunknown-pragmas" } */ + +#pragma oops /* { dg-warning "-:-Wunknown-pragmas" } */ +#pragma GGC diagnostic push /* { dg-warning "-:-Wunknown-pragmas" } */ +#pragma GCC diagnostics push /* { dg-warning "-:-Wunknown-pragmas" } */ + +/* Test we can disable the warnings. */ +#pragma GCC diagnostic ignored "-Wunknown-pragmas" + +#pragma oops /* { dg-bogus "-:-Wunknown-pragmas" } */ +#pragma GGC diagnostic push /* { dg-bogus "-:-Wunknown-pragmas" } */ +#pragma GCC diagnostics push /* { dg-bogus "-:-Wunknown-pragmas" } */ |