diff options
author | Richard Biener <rguenther@suse.de> | 2017-04-06 13:56:35 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-04-06 13:56:35 +0000 |
commit | 09b63f67a11096fb9aa163f9936909bded2e690b (patch) | |
tree | da3f3563b3e45068a62272cac655c0a59901f435 /gcc | |
parent | d9f8c5af8bc43681764923379dc465b62b56877a (diff) | |
download | gcc-09b63f67a11096fb9aa163f9936909bded2e690b.zip gcc-09b63f67a11096fb9aa163f9936909bded2e690b.tar.gz gcc-09b63f67a11096fb9aa163f9936909bded2e690b.tar.bz2 |
re PR tree-optimization/80334 (Segfault when taking address of copy of unaligned struct)
2017-04-06 Richard Biener <rguenther@suse.de>
PR tree-optimization/80334
* tree-ssa-loop-ivopts.c (rewrite_use_address): Properly
preserve alignment of accesses.
* g++.dg/torture/pr80334.C: New testcase.
From-SVN: r246731
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/torture/pr80334.C | 18 | ||||
-rw-r--r-- | gcc/tree-ssa-loop-ivopts.c | 6 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 020d9f87..d4f0c93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2017-04-06 Richard Biener <rguenther@suse.de> + PR tree-optimization/80334 + * tree-ssa-loop-ivopts.c (rewrite_use_address): Properly + preserve alignment of accesses. + +2017-04-06 Richard Biener <rguenther@suse.de> + PR tree-optimization/80262 * tree-sra.c (build_ref_for_offset): Preserve address-space information. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 32f5507..e5b3274 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-06 Richard Biener <rguenther@suse.de> + + PR tree-optimization/80334 + * g++.dg/torture/pr80334.C: New testcase. + 2017-04-06 Martin Liska <mliska@suse.cz> PR sanitizer/80166 diff --git a/gcc/testsuite/g++.dg/torture/pr80334.C b/gcc/testsuite/g++.dg/torture/pr80334.C new file mode 100644 index 0000000..de50c46 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr80334.C @@ -0,0 +1,18 @@ +// { dg-do run } + +struct A { alignas(16) char c; }; +struct B { A unpacked; char d; } __attribute__((packed)); + +char x; + +int +main() +{ + alignas(16) B b[3]; + for (int i = 0; i < 3; i++) b[i].unpacked.c = 'a' + i; + for (int i = 0; i < 3; i++) + { + auto a = new A(b[i].unpacked); + x = a->c; + } +} diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 72e3ff9..d5bd036 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -7396,7 +7396,11 @@ rewrite_use_address (struct ivopts_data *data, base_hint = var_at_stmt (data->current_loop, cand, use->stmt); iv = var_at_stmt (data->current_loop, cand, use->stmt); - ref = create_mem_ref (&bsi, TREE_TYPE (*use->op_p), &aff, + tree type = TREE_TYPE (*use->op_p); + unsigned int align = get_object_alignment (*use->op_p); + if (align != TYPE_ALIGN (type)) + type = build_aligned_type (type, align); + ref = create_mem_ref (&bsi, type, &aff, reference_alias_ptr_type (*use->op_p), iv, base_hint, data->speed); copy_ref_info (ref, *use->op_p); |