From 05c8e58b272aa126a2a3d4f66e95df055bf12bfb Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Fri, 14 Dec 2001 02:16:33 +0000 Subject: [PATCH] expr.c (expand_expr, [...]): Don't honor flag_force_addr for modifier != EXPAND_CONST_ADDRESS... * expr.c (expand_expr, case ADDR_EXPR): Don't honor flag_force_addr for modifier != EXPAND_CONST_ADDRESS, modifier != EXPAND_INITIALIZER and modifier != EXPAND_SUM. * gcc.dg/20011113-1.c: New test. From-SVN: r47984 --- gcc/ChangeLog | 6 ++++++ gcc/expr.c | 6 +++++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/20011113-1.c | 16 ++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/20011113-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74563e64da8..a4ef2067be2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-12-13 Hans-Peter Nilsson + + * expr.c (expand_expr, case ADDR_EXPR): Don't honor + flag_force_addr for modifier != EXPAND_CONST_ADDRESS, + modifier != EXPAND_INITIALIZER and modifier != EXPAND_SUM. + Thu Dec 13 20:30:08 2001 Richard Kenner * expr.c (copy_blkmode_from_reg): Add missing braces to eliminate diff --git a/gcc/expr.c b/gcc/expr.c index 5884217e90e..9e5bf955adb 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -8547,7 +8547,11 @@ expand_expr (exp, target, tmode, modifier) op0 = force_operand (XEXP (op0, 0), target); } - if (flag_force_addr && GET_CODE (op0) != REG) + if (flag_force_addr + && GET_CODE (op0) != REG + && modifier != EXPAND_CONST_ADDRESS + && modifier != EXPAND_INITIALIZER + && modifier != EXPAND_SUM) op0 = force_reg (Pmode, op0); if (GET_CODE (op0) == REG diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 60ace64e508..957cb049774 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2001-12-13 Hans-Peter Nilsson + + * gcc.dg/20011113-1.c: New test. + 2001-12-13 John David Anglin * g++.old-deja/g++.jason/template31.C: Remove templates for classes diff --git a/gcc/testsuite/gcc.dg/20011113-1.c b/gcc/testsuite/gcc.dg/20011113-1.c new file mode 100644 index 00000000000..3f40160ed99 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20011113-1.c @@ -0,0 +1,16 @@ +/* Copyright (C) 2001 Free Software Foundation. + by Hans-Peter Nilsson */ + +/* { dg-do compile } */ +/* { dg-options "-O2 -fforce-addr" } */ + +const char foo[] = "fum"; +const struct fi +{ + const char *const in; + const char *const out; + const int flags; +} fie[] = { + {"nw", " new", 0}, + {"dl", foo, 1} +}; -- 2.30.2