From ec3e68358fa934bd54bf6c93af37360b30dfff70 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 31 May 2004 23:06:33 +0100 Subject: [PATCH] re PR c/15749 (--pedantic-errors behaves differently from --pedantic with C-compiler on Linux) PR c/15749 * c-decl.c (grokdeclarator, finish_struct): Don't pedwarn for misuses of structures with flexible array members if in_system_header. testsuite: * gcc.dg/pr15749-1.c, gcc.dg/pr15749-1.h: New test. From-SVN: r82506 --- gcc/ChangeLog | 7 +++++++ gcc/c-decl.c | 4 ++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr15749-1.c | 8 ++++++++ gcc/testsuite/gcc.dg/pr15749-1.h | 28 ++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr15749-1.c create mode 100644 gcc/testsuite/gcc.dg/pr15749-1.h diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 318d3bdbf25..5d10d0f8b7c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-05-31 Joseph S. Myers + + PR c/15749 + * c-decl.c (grokdeclarator, finish_struct): Don't pedwarn for + misuses of structures with flexible array members if + in_system_header. + 2004-05-31 Eric Botcazou PR target/15693 diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 5cf4e0e239a..3a13664f7b3 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -3928,7 +3928,7 @@ grokdeclarator (tree declarator, tree declspecs, type = error_mark_node; } - if (pedantic && flexible_array_type_p (type)) + if (pedantic && !in_system_header && flexible_array_type_p (type)) pedwarn ("invalid use of structure with flexible array member"); if (size == error_mark_node) @@ -5204,7 +5204,7 @@ finish_struct (tree t, tree fieldlist, tree attributes) } } - if (pedantic && TREE_CODE (t) == RECORD_TYPE + if (pedantic && !in_system_header && TREE_CODE (t) == RECORD_TYPE && flexible_array_type_p (TREE_TYPE (x))) pedwarn ("%Jinvalid use of structure with flexible array member", x); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19d8b061364..a337797b1c8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-31 Joseph S. Myers + + PR c/15749 + * gcc.dg/pr15749-1.c, gcc.dg/pr15749-1.h: New test. + 2004-05-31 Eric Botcazou * gcc.dg/sparc-trap-1.c: New test. diff --git a/gcc/testsuite/gcc.dg/pr15749-1.c b/gcc/testsuite/gcc.dg/pr15749-1.c new file mode 100644 index 00000000000..e78816f80e9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr15749-1.c @@ -0,0 +1,8 @@ +/* Flexible array misuses (that are accepted without -pedantic) should + be OK in system headers even with -pedantic-errors. PR 15749 + from Tuomo dot Tikkanen at nokia dot com. */ +/* Origin: Joseph Myers */ +/* { dg-do compile } */ +/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */ + +#include "pr15749-1.h" diff --git a/gcc/testsuite/gcc.dg/pr15749-1.h b/gcc/testsuite/gcc.dg/pr15749-1.h new file mode 100644 index 00000000000..db4a259fe90 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr15749-1.h @@ -0,0 +1,28 @@ +/* Similar to c99-flex-array-3.c, but a system header so should not + have diagnostics even with -pedantic-errors. */ + +#pragma GCC system_header + +struct flex { int a; int b[]; }; +union rf1 { struct flex a; int b; }; +union rf2 { int a; struct flex b; }; +union rf3 { int a; union rf1 b; }; +union rf4 { union rf2 a; int b; }; + +struct t0 { struct flex a; }; +struct t1 { union rf1 a; }; +struct t2 { union rf2 a; }; +struct t3 { union rf3 a; }; +struct t4 { union rf4 a; }; + +void f0 (struct flex[]); +void f1 (union rf1[]); +void f2 (union rf2[]); +void f3 (union rf3[]); +void f4 (union rf4[]); + +struct flex a0[1]; +union rf1 a1[1]; +union rf2 a2[1]; +union rf3 a3[1]; +union rf4 a4[1]; -- 2.30.2