@@ -1337,15 +1337,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;
@@ -1372,7 +1372,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
@@ -1387,14 +1386,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)
@@ -2718,6 +2718,13 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags)
if (!TREE_TYPE (arg0) || !TREE_TYPE (arg1))
return 0;
+ /* We cannot consider pointers to different address space equal. */
+ if (POINTER_TYPE_P (TREE_TYPE (arg0))
+ && POINTER_TYPE_P (TREE_TYPE (arg1))
+ && (TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (arg0)))
+ != TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (arg1)))))
+ return 0;
+
/* Check equality of integer constants before bailing out due to
precision differences. */
if (TREE_CODE (arg0) == INTEGER_CST && TREE_CODE (arg1) == INTEGER_CST)
@@ -2741,13 +2748,6 @@ operand_equal_p (const_tree arg0, const_tree arg1, unsigned int flags)
!= POINTER_TYPE_P (TREE_TYPE (arg1)))
return 0;
- /* We cannot consider pointers to different address space equal. */
- if (POINTER_TYPE_P (TREE_TYPE (arg0))
- && POINTER_TYPE_P (TREE_TYPE (arg1))
- && (TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (arg0)))
- != TYPE_ADDR_SPACE (TREE_TYPE (TREE_TYPE (arg1)))))
- return 0;
-
/* If both types don't have the same precision, then it is not safe
to strip NOPs. */
if (element_precision (TREE_TYPE (arg0))
new file mode 100644
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O" } */
+/* { dg-final { scan-assembler "fs:16" } } */
+/* { dg-final { scan-assembler "gs:16" } } */
+
+int test(void)
+{
+ int __seg_fs *f = (int __seg_fs *)16;
+ int __seg_gs *g = (int __seg_gs *)16;
+ return *f + *g;
+}