diff options
| author | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
| commit | 61c0330cc243abf13fdd01f377a7f80bd3989eb1 (patch) | |
| tree | 119b08ae76294f23e2b1b7e72ff9a06afa9e8509 /gcc-4.8/gcc/cfgcleanup.c | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.gz toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.bz2 toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.zip | |
[4.8] Merge GCC 4.8.2
Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197
Diffstat (limited to 'gcc-4.8/gcc/cfgcleanup.c')
| -rw-r--r-- | gcc-4.8/gcc/cfgcleanup.c | 18 |
1 files changed, 18 insertions, 0 deletions
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--) |