From: Richard Guenther Date: Tue, 28 Feb 2012 09:15:49 +0000 (+0000) Subject: re PR tree-optimization/52402 (IPA-SRA creates aligned loads from unaligned memory) X-Git-Tag: releases/gcc-4.7.0~179 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a5a825aaecd124c57d3b08ba349631ac8e89123;p=thirdparty%2Fgcc.git re PR tree-optimization/52402 (IPA-SRA creates aligned loads from unaligned memory) 2012-02-28 Richard Guenther PR tree-optimization/52402 * ipa-prop.c (ipa_modify_call_arguments): Properly use mis-aligned types when creating the accesses at the call site. * gcc.dg/torture/pr52402.c: New testcase. From-SVN: r184619 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a89a8ff6943d..24df23ab7deb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-02-28 Richard Guenther + + PR tree-optimization/52402 + * ipa-prop.c (ipa_modify_call_arguments): Properly use + mis-aligned types when creating the accesses at the call site. + 2012-02-28 Georg-Johann Lay * config/avr/builtins.def: New file. diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 6d76adbbfb66..3856793b0546 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2508,9 +2508,27 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt, } } - expr = fold_build2_loc (loc, MEM_REF, adj->type, base, off); - if (adj->by_ref) - expr = build_fold_addr_expr (expr); + if (!adj->by_ref) + { + tree type = adj->type; + unsigned int align; + unsigned HOST_WIDE_INT misalign; + align = get_pointer_alignment_1 (base, &misalign); + misalign += (double_int_sext (tree_to_double_int (off), + TYPE_PRECISION (TREE_TYPE (off))).low + * BITS_PER_UNIT); + misalign = misalign & (align - 1); + if (misalign != 0) + align = (misalign & -misalign); + if (align < TYPE_ALIGN (type)) + type = build_aligned_type (type, align); + expr = fold_build2_loc (loc, MEM_REF, type, base, off); + } + else + { + expr = fold_build2_loc (loc, MEM_REF, adj->type, base, off); + expr = build_fold_addr_expr (expr); + } expr = force_gimple_operand_gsi (&gsi, expr, adj->by_ref diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee4e5f34adea..7a3af5818dac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-28 Richard Guenther + + PR tree-optimization/52402 + * gcc.dg/torture/pr52402.c: New testcase. + 2012-02-28 Richard Guenther PR lto/52400 diff --git a/gcc/testsuite/gcc.dg/torture/pr52402.c b/gcc/testsuite/gcc.dg/torture/pr52402.c new file mode 100644 index 000000000000..5bd51fbdd488 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr52402.c @@ -0,0 +1,28 @@ +/* { dg-do run } */ + +typedef int v4si __attribute__((vector_size(16))); +struct T { v4si i[2]; int j; } __attribute__((packed)); + +static v4si __attribute__((noinline)) +foo (struct T t) +{ + return t.i[0]; +} + +static struct T *__attribute__((noinline)) +init () +{ + char *p = __builtin_malloc (sizeof (struct T) + 1); + p++; + __builtin_memset (p, 1, sizeof (struct T)); + return (struct T *)p; +} + +int main() +{ + struct T *p; + p = init (); + if (foo (*p)[0] != 0x01010101) + __builtin_abort (); + return 0; +}