aboutsummaryrefslogtreecommitdiff
path: root/gcc/expr.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2011-03-09 21:49:00 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2011-03-09 21:49:00 +0100
commitdb7ec03597533caa93e7eb3688de61c0d6e2bc77 (patch)
treef2e41a1f3f62ddafe04756aa6068b27b92c97866 /gcc/expr.c
parent0ad313411053e359863e5ec1a5e426254b67de8f (diff)
downloadgcc-db7ec03597533caa93e7eb3688de61c0d6e2bc77.zip
gcc-db7ec03597533caa93e7eb3688de61c0d6e2bc77.tar.gz
gcc-db7ec03597533caa93e7eb3688de61c0d6e2bc77.tar.bz2
re PR rtl-optimization/47866 (gcc.dg/torture/vector-2.c fails on IA64)
PR rtl-optimization/47866 * expr.c (store_field): If MEM_SCALAR_P (target), don't use MEM_SET_IN_STRUCT_P (to_rtx, 1), just set MEM_IN_STRUCT_P (to_rtx) if target wasn't scalar. * function.c (assign_stack_temp_for_type): Assert that neither MEM_SCALAR_P nor MEM_IN_STRUCT_P is set previously, set either MEM_IN_STRUCT_P or MEM_SCALAR_P instead of using MEM_SET_IN_STRUCT_P macro. * rtl.h (MEM_SET_IN_STRUCT_P): Removed. From-SVN: r170834
Diffstat (limited to 'gcc/expr.c')
-rw-r--r--gcc/expr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/expr.c b/gcc/expr.c
index b09b1ac..6a5f74b 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -5924,7 +5924,8 @@ store_field (rtx target, HOST_WIDE_INT bitsize, HOST_WIDE_INT bitpos,
if (to_rtx == target)
to_rtx = copy_rtx (to_rtx);
- MEM_SET_IN_STRUCT_P (to_rtx, 1);
+ if (!MEM_SCALAR_P (to_rtx))
+ MEM_IN_STRUCT_P (to_rtx) = 1;
if (!MEM_KEEP_ALIAS_SET_P (to_rtx) && MEM_ALIAS_SET (to_rtx) != 0)
set_mem_alias_set (to_rtx, alias_set);