backport: re PR middle-end/21985 (miscompiled or wrong code snippet?)

	Backport:
	2005-06-13  Zdenek Dvorak  <dvorakz@suse.cz>
	PR middle-end/21985
	* fold-const.c (split_address_to_core_and_offset): Always return
	the address of the base object.

	Backport:
	2005-06-19  Richard Henderson  <rth@redhat.com>
	* gcc.dg/tree-ssa/pr21985.c: Use size_t.
	2005-06-13  Zdenek Dvorak  <dvorakz@suse.cz>
	PR middle-end/21985
	* gcc.dg/tree-ssa/pr21985.c: New test.

From-SVN: r101290

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6388b7c8297b97530a968ca26b8250fbab9a05d5..0a8f91e8038530abe3650f538586789493a535d3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-23  Mark Mitchell  <mark@codesourcery.com>
 
+       Backport:
+       2005-06-13  Zdenek Dvorak  <dvorakz@suse.cz>
+       PR middle-end/21985
+       * fold-const.c (split_address_to_core_and_offset): Always return
+       the address of the base object.
+
        PR 22000
        * tree-ssa-operands.c (get_expr_operands): Check the volatility of
        the FIELD_DECL and set s_ann->has_volatile_ops accordingly.

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index f826a5177ed006304304b244155d693fac57054d..1f234873413bbcd608311571896be37e44f5e5de 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11676,9 +11676,7 @@ split_address_to_core_and_offset (tree exp,
       core = get_inner_reference (TREE_OPERAND (exp, 0), &bitsize, pbitpos,
                                  poffset, &mode, &unsignedp, &volatilep,
                                  false);
-
-      if (TREE_CODE (core) == INDIRECT_REF)
-       core = TREE_OPERAND (core, 0);
+      core = build_fold_addr_expr (core);
     }
   else
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8b716481836d49c8ed1ccfee705439d83055b0d2..14a447baa59e14bb2ec139bf1d586e957c64ce98 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-23  Mark Mitchell  <mark@codesourcery.com>
+
+       Backport:
+       2005-06-19  Richard Henderson  <rth@redhat.com>
+       * gcc.dg/tree-ssa/pr21985.c: Use size_t.
+       2005-06-13  Zdenek Dvorak  <dvorakz@suse.cz>
+       PR middle-end/21985
+       * gcc.dg/tree-ssa/pr21985.c: New test.
+
 2005-06-19  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
        * gfortran.dg/backslash_1.f90: New test.