On Wed, Oct 18, 2023 at 05:03:57PM -0400, Lewis Hyatt wrote: > May I please ping this one, and/or, is it something straightforward > enough I can just commit it as obvious? Thanks! > https://gcc.gnu.org/pipermail/gcc-patches/2023-October/631814.html
Please go ahead and apply the patch, thanks. Sorry about the wait. > -Lewis > > On Mon, Oct 2, 2023 at 6:23 PM Lewis Hyatt <lhy...@gmail.com> wrote: > > > > Hello- > > > > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82335 is another > > _Pragma-related bug that got fixed in GCC 12 but is still open. Before > > closing it out, I thought it would be good to add the testcase from that > > PR, which we don't have exactly in the testsuite already. Is it OK please? > > Thanks! > > > > -Lewis > > > > -- >8 -- > > > > This PR was fixed by r12-4797 and r12-5454. Add test coverage from the PR > > that is not represented elsewhere. > > > > gcc/testsuite/ChangeLog: > > > > PR preprocessor/82335 > > * c-c++-common/cpp/diagnostic-pragma-3.c: New test. > > --- > > .../c-c++-common/cpp/diagnostic-pragma-3.c | 37 +++++++++++++++++++ > > 1 file changed, 37 insertions(+) > > create mode 100644 gcc/testsuite/c-c++-common/cpp/diagnostic-pragma-3.c > > > > diff --git a/gcc/testsuite/c-c++-common/cpp/diagnostic-pragma-3.c > > b/gcc/testsuite/c-c++-common/cpp/diagnostic-pragma-3.c > > new file mode 100644 > > index 00000000000..459dcec73b3 > > --- /dev/null > > +++ b/gcc/testsuite/c-c++-common/cpp/diagnostic-pragma-3.c > > @@ -0,0 +1,37 @@ > > +/* This is like diagnostic-pragma-2.c, but handles the case where > > everything > > + is wrapped inside a macro, which previously caused additional issues > > tracked > > + in PR preprocessor/82335. */ > > + > > +/* { dg-do compile } */ > > +/* { dg-additional-options "-save-temps -Wattributes -Wtype-limits" } */ > > + > > +#define B _Pragma("GCC diagnostic push") \ > > + _Pragma("GCC diagnostic ignored \"-Wattributes\"") > > +#define E _Pragma("GCC diagnostic pop") > > + > > +#define X() B int __attribute((unknown_attr)) x; E > > +#define Y B int __attribute((unknown_attr)) y; E > > +#define WRAP(x) x > > + > > +void test1(void) > > +{ > > + WRAP(X()) > > + WRAP(Y) > > +} > > + > > +/* Additional test provided on the PR. */ > > +#define PRAGMA(...) _Pragma(#__VA_ARGS__) > > +#define PUSH_IGN(X) PRAGMA(GCC diagnostic push) PRAGMA(GCC diagnostic > > ignored X) > > +#define POP() PRAGMA(GCC diagnostic pop) > > +#define TEST(X, Y) \ > > + PUSH_IGN("-Wtype-limits") \ > > + int Y = (__typeof(X))-1 < 0; \ > > + POP() > > + > > +int test2() > > +{ > > + unsigned x; > > + TEST(x, i1); > > + WRAP(TEST(x, i2)) > > + return i1 + i2; > > +} > Marek
