===================================================================
@@ -638,7 +638,7 @@ outermost_indep_loop (struct loop *outer
static tree *
simple_mem_ref_in_stmt (gimple stmt, bool *is_store)
{
- tree *lhs;
+ tree *lhs, *rhs;
enum tree_code code;
/* Recognize MEM = (SSA_NAME | invariant) and SSA_NAME = MEM patterns. */
@@ -648,19 +648,21 @@ simple_mem_ref_in_stmt (gimple stmt, boo
code = gimple_assign_rhs_code (stmt);
lhs = gimple_assign_lhs_ptr (stmt);
+ rhs = gimple_assign_rhs1_ptr (stmt);
if (TREE_CODE (*lhs) == SSA_NAME)
{
if (get_gimple_rhs_class (code) != GIMPLE_SINGLE_RHS
- || !is_gimple_addressable (gimple_assign_rhs1 (stmt)))
+ || (!is_gimple_addressable (*rhs)
+ && TREE_CODE (*rhs) != TARGET_MEM_REF))
return NULL;
*is_store = false;
- return gimple_assign_rhs1_ptr (stmt);
+ return rhs;
}
else if (code == SSA_NAME
|| (get_gimple_rhs_class (code) == GIMPLE_SINGLE_RHS
- && is_gimple_min_invariant (gimple_assign_rhs1 (stmt))))
+ && is_gimple_min_invariant (*rhs)))
{
*is_store = true;
return lhs;
===================================================================
@@ -6263,7 +6263,6 @@ tree target_for_debug_bind (tree);
/* In tree-ssa-address.c. */
extern tree tree_mem_ref_addr (tree, tree);
-extern void copy_mem_ref_info (tree, tree);
extern void copy_ref_info (tree, tree);
/* In tree-vrp.c */
===================================================================
@@ -821,16 +821,6 @@ get_address_description (tree op, struct
addr->offset = TMR_OFFSET (op);
}
-/* Copies the additional information attached to target_mem_ref FROM to TO. */
-
-void
-copy_mem_ref_info (tree to, tree from)
-{
- /* And the info about the original reference. */
- TREE_SIDE_EFFECTS (to) = TREE_SIDE_EFFECTS (from);
- TREE_THIS_VOLATILE (to) = TREE_THIS_VOLATILE (from);
-}
-
/* Copies the reference information from OLD_REF to NEW_REF, where
NEW_REF should be either a MEM_REF or a TARGET_MEM_REF. */
@@ -901,7 +891,7 @@ maybe_fold_tmr (tree ref)
{
struct mem_address addr;
bool changed = false;
- tree ret, off;
+ tree new_ref, off;
get_address_description (ref, &addr);
@@ -962,10 +952,11 @@ maybe_fold_tmr (tree ref)
ended up folding it, always create a new TARGET_MEM_REF regardless
if it is valid in this for on the target - the propagation result
wouldn't be anyway. */
- ret = create_mem_ref_raw (TREE_TYPE (ref),
- TREE_TYPE (addr.offset), &addr, false);
- copy_mem_ref_info (ret, ref);
- return ret;
+ new_ref = create_mem_ref_raw (TREE_TYPE (ref),
+ TREE_TYPE (addr.offset), &addr, false);
+ TREE_SIDE_EFFECTS (new_ref) = TREE_SIDE_EFFECTS (ref);
+ TREE_THIS_VOLATILE (new_ref) = TREE_THIS_VOLATILE (ref);
+ return new_ref;
}
/* Dump PARTS to FILE. */