aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-11-29 11:33:06 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-11-29 11:33:06 +0100
commit65d5e454e5944531df80d0a9b5dcf2344c146fb8 (patch)
tree12c33166e506675dec27298801f05e723e4ccaed /gcc/tree.c
parentcedd8ca58336b0c5b061b3c03c0a646fe08b616c (diff)
downloadgcc-65d5e454e5944531df80d0a9b5dcf2344c146fb8.zip
gcc-65d5e454e5944531df80d0a9b5dcf2344c146fb8.tar.gz
gcc-65d5e454e5944531df80d0a9b5dcf2344c146fb8.tar.bz2
re PR middle-end/83185 (ICE with -fsanitize=address in build_simple_mem_ref_loc, at tree.c:4696)
PR middle-end/83185 * tree.c (build_simple_mem_ref_loc): Handle get_addr_base_and_unit_offset returning a MEM_REF. * gcc.dg/asan/pr83185.c: New test. From-SVN: r255229
Diffstat (limited to 'gcc/tree.c')
-rw-r--r--gcc/tree.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/tree.c b/gcc/tree.c
index e97654c..b390247 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -4692,7 +4692,13 @@ build_simple_mem_ref_loc (location_t loc, tree ptr)
{
ptr = get_addr_base_and_unit_offset (TREE_OPERAND (ptr, 0), &offset);
gcc_assert (ptr);
- ptr = build_fold_addr_expr (ptr);
+ if (TREE_CODE (ptr) == MEM_REF)
+ {
+ offset += mem_ref_offset (ptr).to_short_addr ();
+ ptr = TREE_OPERAND (ptr, 0);
+ }
+ else
+ ptr = build_fold_addr_expr (ptr);
gcc_assert (is_gimple_reg (ptr) || is_gimple_min_invariant (ptr));
}
tem = build2 (MEM_REF, TREE_TYPE (ptype),