diff options
| author | Richard Henderson <rth@redhat.com> | 2015-11-09 01:18:35 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2015-11-09 01:18:35 -0800 |
| commit | bd68a3a7e74c8a034dab3efd84c09c4fed066fc1 (patch) | |
| tree | 46bd72668958aed984a4145ddb893bf82b2a00da /gcc/cselib.c | |
| parent | f0ebde5acecc9fd69fd6dc1c8a9dd568edf96747 (diff) | |
Avoid CSE of MEMs in different address spaces
* cselib.c (add_mem_for_addr): Compare address spaces when
matching memories.
(cselib_lookup_mem): Likewise.
* fold-const.c (operand_equal_p): Check address spaces of
pointer types before checking integer constants.
From-SVN: r229998
Diffstat (limited to 'gcc/cselib.c')
| -rw-r--r-- | gcc/cselib.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gcc/cselib.c b/gcc/cselib.c index 4fc70971881..8d73f15aa11 100644 --- a/gcc/cselib.c +++ b/gcc/cselib.c @@ -1329,15 +1329,15 @@ new_cselib_val (unsigned int hash, machine_mode mode, rtx x) static void add_mem_for_addr (cselib_val *addr_elt, cselib_val *mem_elt, rtx x) { - struct elt_loc_list *l; - addr_elt = canonical_cselib_val (addr_elt); mem_elt = canonical_cselib_val (mem_elt); /* Avoid duplicates. */ - for (l = mem_elt->locs; l; l = l->next) + addr_space_t as = MEM_ADDR_SPACE (x); + for (elt_loc_list *l = mem_elt->locs; l; l = l->next) if (MEM_P (l->loc) - && CSELIB_VAL_PTR (XEXP (l->loc, 0)) == addr_elt) + && CSELIB_VAL_PTR (XEXP (l->loc, 0)) == addr_elt + && MEM_ADDR_SPACE (l->loc) == as) { promote_debug_loc (l); return; @@ -1364,7 +1364,6 @@ cselib_lookup_mem (rtx x, int create) cselib_val **slot; cselib_val *addr; cselib_val *mem_elt; - struct elt_list *l; if (MEM_VOLATILE_P (x) || mode == BLKmode || !cselib_record_memory @@ -1379,14 +1378,19 @@ cselib_lookup_mem (rtx x, int create) addr = cselib_lookup (XEXP (x, 0), addr_mode, create, mode); if (! addr) return 0; - addr = canonical_cselib_val (addr); + /* Find a value that describes a value of our mode at that address. */ - for (l = addr->addr_list; l; l = l->next) + addr_space_t as = MEM_ADDR_SPACE (x); + for (elt_list *l = addr->addr_list; l; l = l->next) if (GET_MODE (l->elt->val_rtx) == mode) { - promote_debug_loc (l->elt->locs); - return l->elt; + for (elt_loc_list *l2 = l->elt->locs; l2; l2 = l2->next) + if (MEM_P (l2->loc) && MEM_ADDR_SPACE (l2->loc) == as) + { + promote_debug_loc (l->elt->locs); + return l->elt; + } } if (! create) |