From ae1c17f95064a1a19a94f15a73c832b2e46164ae Mon Sep 17 00:00:00 2001 From: clyon Date: Fri, 14 Nov 2014 11:53:02 +0000 Subject: [PATCH] gcc/ 2014-11-14 Michael Collison Backport from trunk r212178.. 2014-06-30 Joseph Myers * var-tracking.c (add_stores): Return instead of asserting if old and new values for conditional store are the same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/linaro@217555 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc-4_8-branch/gcc/ChangeLog.linaro | 8 ++++++++ gcc-4_8-branch/gcc/var-tracking.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc-4_8-branch/gcc/ChangeLog.linaro b/gcc-4_8-branch/gcc/ChangeLog.linaro index cf78c691c7b..21fe5d42103 100644 --- a/gcc-4_8-branch/gcc/ChangeLog.linaro +++ b/gcc-4_8-branch/gcc/ChangeLog.linaro @@ -1,3 +1,11 @@ +2014-11-14 Michael Collison + + Backport from trunk r212178.. + 2014-06-30 Joseph Myers + + * var-tracking.c (add_stores): Return instead of asserting if old + and new values for conditional store are the same. + 2014-11-14 Yvan Roux Add Linaro release macros (Linaro only patch.) diff --git a/gcc-4_8-branch/gcc/var-tracking.c b/gcc-4_8-branch/gcc/var-tracking.c index 0db15625b70..fe1ce6070d7 100644 --- a/gcc-4_8-branch/gcc/var-tracking.c +++ b/gcc-4_8-branch/gcc/var-tracking.c @@ -5915,7 +5915,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip) { cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode); - gcc_assert (oval != v); + if (oval == v) + return; gcc_assert (REG_P (oloc) || MEM_P (oloc)); if (oval && !cselib_preserved_value_p (oval)) -- 2.11.4.GIT