From 3d947f1f27188e3a61ba7f42399b1c348469fe13 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 7 Apr 2020 16:29:37 +0200 Subject: [PATCH] middle-end/94479 - fix gimplification of address When gimplifying an address operand we may expose an indirect ref via DECL_VALUE_EXPR for example. This is dealt with in the code already but it fails to consider that INDIRECT_REFs get gimplified to MEM_REFs. Fixed which makes the ICE observed on x86_64-netbsd go away. 2020-04-07 Richard Biener PR middle-end/94479 * gimplify.c (gimplify_addr_expr): Also consider generated MEM_REFs. * gcc.dg/torture/pr94479.c: New testcase. --- gcc/ChangeLog | 6 ++++++ gcc/gimplify.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr94479.c | 12 ++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr94479.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c5e197591b..a1ab9fb4ef3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-04-07 Richard Biener + + PR middle-end/94479 + * gimplify.c (gimplify_addr_expr): Also consider generated + MEM_REFs. + 2020-04-07 Andre Vieira * config/arm/arm_mve.h: Add C++ polymorphism and fix preserve MACROs. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 787435c38cd..8cdfae26510 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -6181,7 +6181,9 @@ gimplify_addr_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) /* For various reasons, the gimplification of the expression may have made a new INDIRECT_REF. */ - if (TREE_CODE (op0) == INDIRECT_REF) + if (TREE_CODE (op0) == INDIRECT_REF + || (TREE_CODE (op0) == MEM_REF + && integer_zerop (TREE_OPERAND (op0, 1)))) goto do_indirect_ref; mark_addressable (TREE_OPERAND (expr, 0)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 096cfce891e..71b5a14bcbe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-07 Richard Biener + + PR middle-end/94479 + * gcc.dg/torture/pr94479.c: New testcase. + 2020-04-01 Fritz Reese PR fortran/93871 diff --git a/gcc/testsuite/gcc.dg/torture/pr94479.c b/gcc/testsuite/gcc.dg/torture/pr94479.c new file mode 100644 index 00000000000..53285bb4f38 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr94479.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-require-stack-check "specific" } */ +/* { dg-additional-options "-fstack-check -w" } */ + +int a; +struct b { + char c; + void *d; +}; +struct b e() { + struct b f[] = {{}, "", f, a}; +} -- 2.30.2