From 43303d6f8e85a9c271b1229471b2777a8c68bf16 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 7 May 2013 10:28:01 +0200 Subject: [PATCH] re PR debug/57184 (ICE in expand_expr_real_1, at expr.c:10478) PR debug/57184 * expr.c (expand_expr_addr_expr_1): Handle COMPOUND_LITERAL_EXPR for modifier == EXPAND_INITIALIZER. * gcc.dg/pr57184.c: New test. From-SVN: r198666 --- gcc/ChangeLog | 6 ++++++ gcc/expr.c | 9 +++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr57184.c | 13 +++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr57184.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2388ac8df9a..853ca0aa77e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-05-07 Jakub Jelinek + + PR debug/57184 + * expr.c (expand_expr_addr_expr_1): Handle COMPOUND_LITERAL_EXPR + for modifier == EXPAND_INITIALIZER. + 2013-05-07 Anton Blanchard * configure.ac (HAVE_LD_LARGE_TOC): Use correct linker emulation diff --git a/gcc/expr.c b/gcc/expr.c index acf282e7808..5663408b37b 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -7561,6 +7561,15 @@ expand_expr_addr_expr_1 (tree exp, rtx target, enum machine_mode tmode, inner = TREE_OPERAND (exp, 0); break; + case COMPOUND_LITERAL_EXPR: + /* Allow COMPOUND_LITERAL_EXPR in initializers, if e.g. + rtl_for_decl_init is called on DECL_INITIAL with + COMPOUNT_LITERAL_EXPRs in it, they aren't gimplified. */ + if (modifier == EXPAND_INITIALIZER + && COMPOUND_LITERAL_EXPR_DECL (exp)) + return expand_expr_addr_expr_1 (COMPOUND_LITERAL_EXPR_DECL (exp), + target, tmode, modifier, as); + /* FALLTHRU */ default: /* If the object is a DECL, then expand it for its rtl. Don't bypass expand_expr, as that can have various side effects; LABEL_DECLs for diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0908c8678e9..dee99f81e9f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-05-07 Jakub Jelinek + + PR debug/57184 + * gcc.dg/pr57184.c: New test. + 2013-05-07 Eric Botcazou * gnat.dg/specs/array3.ads: New test. diff --git a/gcc/testsuite/gcc.dg/pr57184.c b/gcc/testsuite/gcc.dg/pr57184.c new file mode 100644 index 00000000000..319d3fd5312 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr57184.c @@ -0,0 +1,13 @@ +/* PR debug/57184 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -g" } */ + +struct S {}; +void bar (struct S *const); +static struct S *const c = &(struct S) {}; + +void +foo (void) +{ + bar (c); +} -- 2.30.2