diff options
author | Lewis Hyatt <lhyatt@gmail.com> | 2023-11-10 11:10:18 -0500 |
---|---|---|
committer | Lewis Hyatt <lhyatt@gmail.com> | 2023-11-14 17:50:42 -0500 |
commit | 9938645fcf914ec2a3fa8137cf1456ad4af5f77c (patch) | |
tree | 8875498bc2df0eaeb62610361d15514c82fbd6cd | |
parent | f71352c71d78ac977ea0e71a6900699a8cf09219 (diff) | |
download | gcc-9938645fcf914ec2a3fa8137cf1456ad4af5f77c.zip gcc-9938645fcf914ec2a3fa8137cf1456ad4af5f77c.tar.gz gcc-9938645fcf914ec2a3fa8137cf1456ad4af5f77c.tar.bz2 |
c-family: Let libcpp know when the compilation is for a PCH [PR9471]
libcpp will generate diagnostics when it encounters things in the main file
that only belong in a header file, such as `#pragma once' or `#pragma GCC
system_header'. But sometimes the main file is a header file that is just
being compiled separately, e.g. to produce a C++ module or a PCH, in which
case such diagnostics should be suppressed. libcpp already has an interface
to request that, so make use of it in the C frontends to prevent libcpp from
issuing unwanted diagnostics when compiling a PCH.
gcc/c-family/ChangeLog:
PR pch/9471
PR pch/47857
* c-opts.cc (c_common_post_options): Set cpp_opts->main_search
so libcpp knows it is compiling a header file separately.
gcc/testsuite/ChangeLog:
PR pch/9471
PR pch/47857
* g++.dg/pch/main-file-warnings.C: New test.
* g++.dg/pch/main-file-warnings.Hs: New test.
* gcc.dg/pch/main-file-warnings.c: New test.
* gcc.dg/pch/main-file-warnings.hs: New test.
-rw-r--r-- | gcc/c-family/c-opts.cc | 3 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/pch/main-file-warnings.C | 7 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/pch/main-file-warnings.Hs | 3 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pch/main-file-warnings.c | 7 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/pch/main-file-warnings.hs | 3 |
5 files changed, 23 insertions, 0 deletions
diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc index fbabd18..10403c0 100644 --- a/gcc/c-family/c-opts.cc +++ b/gcc/c-family/c-opts.cc @@ -1174,6 +1174,9 @@ c_common_post_options (const char **pfilename) "the %qs debug info cannot be used with " "pre-compiled headers", debug_set_names (write_symbols & ~DWARF2_DEBUG)); + /* Let libcpp know that the main file is a header so it won't + complain about things like #include_next and #pragma once. */ + cpp_opts->main_search = CMS_header; } else if (write_symbols != NO_DEBUG && write_symbols != DWARF2_DEBUG) c_common_no_more_pch (); diff --git a/gcc/testsuite/g++.dg/pch/main-file-warnings.C b/gcc/testsuite/g++.dg/pch/main-file-warnings.C new file mode 100644 index 0000000..a9e8b0b --- /dev/null +++ b/gcc/testsuite/g++.dg/pch/main-file-warnings.C @@ -0,0 +1,7 @@ +/* PR pch/9471 */ +/* PR pch/47857 */ +/* Test will fail if any warnings get issued while compiling the header into a PCH. */ +#include "main-file-warnings.H" +#pragma once /* { dg-warning "in main file" } */ +#pragma GCC system_header /* { dg-warning "outside include file" } */ +#include_next <stdint.h> /* { dg-warning "in primary source file" } */ diff --git a/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs b/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs new file mode 100644 index 0000000..d1582bb --- /dev/null +++ b/gcc/testsuite/g++.dg/pch/main-file-warnings.Hs @@ -0,0 +1,3 @@ +#pragma once /* { dg-bogus "in main file" } */ +#pragma GCC system_header /* { dg-bogus "outside include file" } */ +#include_next <stdint.h> /* { dg-bogus "in primary source file" } */ diff --git a/gcc/testsuite/gcc.dg/pch/main-file-warnings.c b/gcc/testsuite/gcc.dg/pch/main-file-warnings.c new file mode 100644 index 0000000..aedbc15 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pch/main-file-warnings.c @@ -0,0 +1,7 @@ +/* PR pch/9471 */ +/* PR pch/47857 */ +/* Test will fail if any warnings get issued while compiling the header into a PCH. */ +#include "main-file-warnings.h" +#pragma once /* { dg-warning "in main file" } */ +#pragma GCC system_header /* { dg-warning "outside include file" } */ +#include_next <stdint.h> /* { dg-warning "in primary source file" } */ diff --git a/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs b/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs new file mode 100644 index 0000000..d1582bb --- /dev/null +++ b/gcc/testsuite/gcc.dg/pch/main-file-warnings.hs @@ -0,0 +1,3 @@ +#pragma once /* { dg-bogus "in main file" } */ +#pragma GCC system_header /* { dg-bogus "outside include file" } */ +#include_next <stdint.h> /* { dg-bogus "in primary source file" } */ |