From 61c0330cc243abf13fdd01f377a7f80bd3989eb1 Mon Sep 17 00:00:00 2001 From: synergydev Date: Thu, 17 Oct 2013 18:16:42 -0700 Subject: [4.8] Merge GCC 4.8.2 Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197 --- gcc-4.8/gcc/cfgcleanup.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gcc-4.8/gcc/cfgcleanup.c') diff --git a/gcc-4.8/gcc/cfgcleanup.c b/gcc-4.8/gcc/cfgcleanup.c index 471d293f1..8a120bf90 100644 --- a/gcc-4.8/gcc/cfgcleanup.c +++ b/gcc-4.8/gcc/cfgcleanup.c @@ -927,6 +927,24 @@ merge_memattrs (rtx x, rtx y) set_mem_align (y, MEM_ALIGN (x)); } } + if (code == MEM) + { + if (MEM_READONLY_P (x) != MEM_READONLY_P (y)) + { + MEM_READONLY_P (x) = 0; + MEM_READONLY_P (y) = 0; + } + if (MEM_NOTRAP_P (x) != MEM_NOTRAP_P (y)) + { + MEM_NOTRAP_P (x) = 0; + MEM_NOTRAP_P (y) = 0; + } + if (MEM_VOLATILE_P (x) != MEM_VOLATILE_P (y)) + { + MEM_VOLATILE_P (x) = 1; + MEM_VOLATILE_P (y) = 1; + } + } fmt = GET_RTX_FORMAT (code); for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) -- cgit v1.2.3