backport: emit-rtl.c (set_mem_attributes_minus_bitpos): Don't kill previous MEM_VOLAT...

	Backport:
	2004-02-12  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
	* emit-rtl.c (set_mem_attributes_minus_bitpos): Don't kill previous
	MEM_VOLATILE in REF).

From-SVN: r99489

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e711521d14f29cb2e51fd988af85cddc754cef5..9af5828dbd4a9ed9edb52757bb05b58a5ef59b47 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-09  Grigory Tolstolytkin <gtolstolytkin@ru.mvista.com>
+
+       Backport:
+       2004-02-12  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+       * emit-rtl.c (set_mem_attributes_minus_bitpos): Don't kill previous
+       MEM_VOLATILE in REF).
+
 2005-05-10  Ben Elliston  <bje@au.ibm.com>
 
        PR debug/16676

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 9df2d6c4f8ddb75498e5447c71f427ca996e0362..92832256f93bf8302b4b3e7baef2e4e059ac8f1e 100644 (file)
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -1592,7 +1592,7 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp,
      front-end routine) and use it.  */
   alias = get_alias_set (t);
 
-  MEM_VOLATILE_P (ref) = TYPE_VOLATILE (type);
+  MEM_VOLATILE_P (ref) |= TYPE_VOLATILE (type);
   MEM_IN_STRUCT_P (ref) = AGGREGATE_TYPE_P (type);
   RTX_UNCHANGING_P (ref)
     |= ((lang_hooks.honor_readonly