From 931e6c29a71dfc9923a9a106c112ddfb1bc66112 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Sun, 26 Sep 2004 19:13:38 +0000
Subject: [PATCH] builtins.c (get_memory_rtx): Set mem attributes for
 non-ADDR_EXPR expressions.

	* builtins.c (get_memory_rtx): Set mem attributes for non-ADDR_EXPR
	expressions.  Always clear MEM_SIZE and alias set.

From-SVN: r88141
---
 gcc/ChangeLog  |  5 +++++
 gcc/builtins.c | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75ba5a7163f..718e13116ff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-26  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* builtins.c (get_memory_rtx): Set mem attributes for non-ADDR_EXPR
+	expressions.  Always clear MEM_SIZE and alias set.
+
 2004-09-26  Roger Sayle  <roger@eyesopen.com>
 	    Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
diff --git a/gcc/builtins.c b/gcc/builtins.c
index f3ee9e9b348..9127f45b6aa 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -990,15 +990,20 @@ get_memory_rtx (tree exp)
     exp = TREE_OPERAND (exp, 0);
 
   if (TREE_CODE (exp) == ADDR_EXPR)
-    {
-      exp = TREE_OPERAND (exp, 0);
-      set_mem_attributes (mem, exp, 0);
-    }
+    exp = TREE_OPERAND (exp, 0);
   else if (POINTER_TYPE_P (TREE_TYPE (exp)))
+    exp = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (exp)), exp);
+  else
+    exp = NULL;
+
+  /* Honor attributes derived from exp, except for the alias set
+     (as builtin stringops may alias with anything) and the size
+     (as stringops may access multiple array elements).  */
+  if (exp)
     {
-      exp = build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (exp)), exp);
-      /* memcpy, memset and other builtin stringops can alias with anything.  */
+      set_mem_attributes (mem, exp, 0);
       set_mem_alias_set (mem, 0);
+      set_mem_size (mem, NULL_RTX);
     }
 
   return mem;