From 419e1853a8747c6d344ed6f23cf6bb63299e485b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 18 Mar 2011 09:35:17 +0100 Subject: [PATCH] re PR bootstrap/48161 (hppa*-*-* will not bootstrap on 4.6 branch with release checking) PR bootstrap/48161 * expr.c (expand_expr_addr_expr_1): Use simplify_gen_binary instead of gen_rtx_PLUS if EXPAND_SUM or EXPAND_INITIALIZER. * gcc.c-torture/compile/pr48161.c: New test. From-SVN: r171126 --- gcc/ChangeLog | 7 ++++++ gcc/expr.c | 2 +- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.c-torture/compile/pr48161.c | 24 +++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr48161.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b96cadb8b31..792dfb3a310 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-03-18 Richard Henderson + Jakub Jelinek + + PR bootstrap/48161 + * expr.c (expand_expr_addr_expr_1): Use simplify_gen_binary + instead of gen_rtx_PLUS if EXPAND_SUM or EXPAND_INITIALIZER. + 2011-03-17 H.J. Lu PR middle-end/47725 diff --git a/gcc/expr.c b/gcc/expr.c index 6a5f74b4210..3295156e139 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -6971,7 +6971,7 @@ expand_expr_addr_expr_1 (tree exp, rtx target, enum machine_mode tmode, tmp = convert_memory_address_addr_space (tmode, tmp, as); if (modifier == EXPAND_SUM || modifier == EXPAND_INITIALIZER) - result = gen_rtx_PLUS (tmode, result, tmp); + result = simplify_gen_binary (PLUS, tmode, result, tmp); else { subtarget = bitpos ? NULL_RTX : target; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 51f748c2e22..59d736a71f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-03-18 Jakub Jelinek + + PR bootstrap/48161 + * gcc.c-torture/compile/pr48161.c: New test. + 2011-03-17 H.J. Lu PR middle-end/47725 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr48161.c b/gcc/testsuite/gcc.c-torture/compile/pr48161.c new file mode 100644 index 00000000000..c454efcd073 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr48161.c @@ -0,0 +1,24 @@ +/* PR bootstrap/48161 */ + +struct T { int u; }; +struct G { int l; int t; int r; }; +struct V { struct G v[10]; }; +struct { struct V b; } *h; +void bar (void); + +struct G * +baz (struct V *x, unsigned y) +{ + return &x->v[y]; +} + +int +foo (struct T *x, struct T *y) +{ + if ((baz (&h->b, y->u)->t ? baz (&h->b, y->u)->t : 0) + - baz (h ? &h->b : 0, x->u)->r + - (baz (h ? &h->b : 0, x->u)->t > 0 ? 5 : 0)) + return 1; + bar (); + return 0; +} -- 2.30.2