alias.c (set_mem_alias_set): New function.

	* alias.c (set_mem_alias_set): New function.
	* rtl.h (set_mem_alias_set): Declare it.
	* builtins.c (expand_builtin_return_addr): Call it instead of
	using MEM_ALIAS_SET accessor.
	(expand_builtin_setjmp_setup, expand_builtin_longjmp): Likewise.
	(get_memory_rtx, expand_builtin_va_arg): Likewise.
	(expand_builtin_va_copy):Likewise.
	* caller-save.c (setup_save_areas): Likewise.
	* calls.c (compute_argument_addresses): Likewise.
	* explow.c (set_mem_attributes): Likewise.
	* expr.c (emit_single_push_insn, emit_push_insn): Likewise.
	(expand_assignment, store_constructor_field, store_field): Likewise.
	(expand_expr_unaligned): Likewise.
	* function.c (assign_stack_temp_for_type): Likewise.
	(put_reg_into_stack, gen_mem_addressof): Likewise.
	* ifcvt.c (noce_try_cmove_arith): Likewise.
	* reload1.c (reload, alter_reg): Likewise.
	* config/alpha/alpha.c (get_aligned_mem): Likewise.
	(alpha_set_memflags_1, alpha_expand_unaligned_load): Likewise.
	(alpha_expand_unaligned_store): Likewise
	(alpha_expand_unaligned_load_words): Likewise.
	(alpha_expand_unaligned_store_words): Likewise.
	(alpha_expand_block_clear, alpha_expand_prologue): Likewise.
	(alpha_expand_epilogue): Likewise.
	* config/arc/arc.c (arc_setup_incoming_varargs): Likewise.
	* config/clipper/clipper.c (clipper_builtin_saveregs): Likewise.
	* config/i386/i386.c (legitimize_pic_address): Likewise.
	* config/i960/i960.c (setup_incoming_varargs): Likewise.
	* config/ia64/ia64.c (spill_restore_mem): Likewise.
	* config/m32r/m32r.c (m32r_setup_incoming_varargs): Likewise.
	* config/m8k/m88k.c (m88k_builtin_saveregs): Likewise.
	* config/mips/mips.c (mips_va_arg): Likewise.
	* config/mn10300/mn10300.c (mn10300_builtin_saveregs): Likewise.
	* config/pa/pa.c (hppa_builtin_saveregs): Likewise.
	* config/rs6000/rs6000.c (rs6000_emit_move): Likewise.
	(setup_incoming_varargs, rs6000_va_arg): Likewise.
	(rs6000_emit_eh_toc_restore, rs6000_emit_prologue): Likewise.
	(rs6000_emit_epilogue): Likewise.
	* config/sh/sh.c (sh_builtin_saveregs): Likewise.
	* config/sparc/sparc.c (sparc_va_arg): Likewise.
	* config/v850/v850.c (v850_va_arg): Likewise.

From-SVN: r43951

1 files changed, 9 insertions, 10 deletions

diff --git a/gcc/expr.c b/gcc/expr.c
index 3786ee9..0021910 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -3181,7 +3181,7 @@ emit_single_push_insn (mode, x, type)
          outgoing arguments and we cannot allow reordering of reads
          from function arguments with stores to outgoing arguments
          of sibling calls.  */
-      MEM_ALIAS_SET (dest) = 0;
+      set_mem_alias_set (dest, 0);
     }
   emit_move_insn (dest, x);
 #else
@@ -3399,7 +3399,7 @@ emit_push_insn (x, mode, type, size, align, partial, reg, extra,
 		 outgoing arguments and we cannot allow reordering of reads
 		 from function arguments with stores to outgoing arguments
 		 of sibling calls.  */
-	      MEM_ALIAS_SET (target) = 0;
+	      set_mem_alias_set (target, 0);
 	    }
 
 	  /* TEMP is the address of the block.  Copy the data there.  */
@@ -3582,7 +3582,7 @@ emit_push_insn (x, mode, type, size, align, partial, reg, extra,
 		 outgoing arguments and we cannot allow reordering of reads
 		 from function arguments with stores to outgoing arguments
 		 of sibling calls.  */
-	      MEM_ALIAS_SET (dest) = 0;
+	      set_mem_alias_set (dest, 0);
 	    }
 
 	  emit_move_insn (dest, x);
@@ -3906,7 +3906,7 @@ expand_assignment (to, from, want_value, suggest_reg)
     {
       to_rtx = expand_expr (to, NULL_RTX, VOIDmode, EXPAND_MEMORY_USE_WO);
       if (GET_CODE (to_rtx) == MEM)
-	MEM_ALIAS_SET (to_rtx) = get_alias_set (to);
+	set_mem_alias_set (to_rtx, get_alias_set (to));
     }
 
   /* Don't move directly into a return register.  */
@@ -4478,7 +4478,7 @@ store_constructor_field (target, bitsize, bitpos,
       if (bitpos != 0)
 	align = MIN (align, (unsigned int) bitpos & - bitpos);
       if (GET_CODE (target) == MEM)
-	MEM_ALIAS_SET (target) = alias_set;
+	set_mem_alias_set (target, alias_set);
 
       store_constructor (exp, target, align, cleared, bitsize / BITS_PER_UNIT);
     }
@@ -5334,10 +5334,9 @@ store_field (target, bitsize, bitpos, mode, exp, value_mode,
 	 at the same location.  We will give the structures alias set
 	 zero; here we must be careful not to give non-zero alias sets
 	 to their fields.  */
-      if (!rtx_varies_p (addr, /*for_alias=*/0))
-	MEM_ALIAS_SET (to_rtx) = alias_set;
-      else
-	MEM_ALIAS_SET (to_rtx) = 0;
+      set_mem_alias_set (to_rtx,
+			 rtx_varies_p (addr, /*for_alias=*/0)
+			 ? 0 : alias_set);
 
       return store_expr (exp, to_rtx, value_mode != VOIDmode);
     }
@@ -9141,7 +9140,7 @@ expand_expr_unaligned (exp, palign)
 	  /* Get a reference to just this component.  */
 	  op0 = adjust_address (op0, mode1, bitpos / BITS_PER_UNIT);
 
-	MEM_ALIAS_SET (op0) = get_alias_set (exp);
+	set_mem_alias_set (op0, get_alias_set (exp));
 
 	/* Adjust the alignment in case the bit position is not
 	   a multiple of the alignment of the inner object.  */