From 129b5a87032462b9cf38e6005227f1672e7889ee Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 30 May 2017 09:09:01 +0200 Subject: [PATCH] =?utf8?q?backport:=20re=20PR=20c/72816=20(ICE=20on=20x86?= =?utf8?q?=5F64-linux-gnu=20(tree=20check:=20expected=20tree=20that=20cont?= =?utf8?q?ains=20=E2=80=98decl=20with=20RTL=E2=80=99=20structure,=20have?= =?utf8?q?=20=E2=80=98field=5Fdecl=E2=80=99=20in=20set=5Fdecl=5Frtl,=20at?= =?utf8?q?=20emit-rtl.c:1282))?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Backported from mainline 2016-08-11 Jakub Jelinek PR c/72816 * c-decl.c (grokdeclarator): When adding TYPE_DOMAIN for flexible array member through typedef, for orig_qual_indirect == 0 clear orig_qual_type. 2016-08-11 Jakub Jelinek PR c/72816 * gcc.dg/pr72816.c: Remove dg-error. 2016-08-07 Jakub Jelinek PR c/72816 * gcc.dg/pr72816.c: New test. From-SVN: r248594 --- gcc/c/ChangeLog | 10 ++++++++++ gcc/c/c-decl.c | 2 ++ gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/gcc.dg/pr72816.c | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr72816.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 85f9e9a0f5b3..ca0fd0dc4b8f 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,13 @@ +2017-05-30 Jakub Jelinek + + Backported from mainline + 2016-08-11 Jakub Jelinek + + PR c/72816 + * c-decl.c (grokdeclarator): When adding TYPE_DOMAIN for flexible + array member through typedef, for orig_qual_indirect == 0 clear + orig_qual_type. + 2016-11-05 Martin Sebor Backport from trunk. diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index d1e74443f0ee..0737c400e2ea 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -6572,6 +6572,8 @@ grokdeclarator (const struct c_declarator *declarator, type = build_distinct_type_copy (TYPE_MAIN_VARIANT (type)); TYPE_DOMAIN (type) = build_range_type (sizetype, size_zero_node, NULL_TREE); + if (orig_qual_indirect == 0) + orig_qual_type = NULL_TREE; } type = c_build_qualified_type (type, type_quals, orig_qual_type, orig_qual_indirect); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 317787d928d0..c416f4064992 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,11 +1,21 @@ 2017-05-30 Jakub Jelinek Backported from mainline + 2016-08-11 Jakub Jelinek + + PR c/72816 + * gcc.dg/pr72816.c: Remove dg-error. + 2016-08-09 Jakub Jelinek PR tree-optimization/72824 * gcc.c-torture/execute/ieee/pr72824.c: New test. + 2016-08-07 Jakub Jelinek + + PR c/72816 + * gcc.dg/pr72816.c: New test. + 2017-05-29 Martin Liska Backport from mainline diff --git a/gcc/testsuite/gcc.dg/pr72816.c b/gcc/testsuite/gcc.dg/pr72816.c new file mode 100644 index 000000000000..b1498c7a7032 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr72816.c @@ -0,0 +1,9 @@ +/* PR c/72816 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu11" } */ + +typedef const int A[]; +struct S { + int a; + A b; +}; -- 2.47.2