aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cse.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e5a2985..efb67ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2014-07-20 Eric Botcazou <ebotcazou@adacore.com>
+ * cse.c (exp_equiv_p) <MEM>: For GCSE, return 0 for expressions with
+ different trapping status if -fnon-call-exceptions is enabled.
+
+2014-07-20 Eric Botcazou <ebotcazou@adacore.com>
+
* expr.c (store_field): Handle VOIDmode for calls that return values
in multiple locations.
diff --git a/gcc/cse.c b/gcc/cse.c
index bb88b52..34f9364 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -2687,6 +2687,13 @@ exp_equiv_p (const_rtx x, const_rtx y, int validate, bool for_gcse)
the same attributes share the same mem_attrs data structure. */
if (MEM_ATTRS (x) != MEM_ATTRS (y))
return 0;
+
+ /* If we are handling exceptions, we cannot consider two expressions
+ with different trapping status as equivalent, because simple_mem
+ might accept one and reject the other. */
+ if (cfun->can_throw_non_call_exceptions
+ && (MEM_NOTRAP_P (x) != MEM_NOTRAP_P (y)))
+ return 0;
}
break;