diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2014-11-14 11:53:02 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2014-11-14 11:53:02 +0000 |
| commit | 4e9c4f06fa7d302d542ee7683c4a4d1881db7e8a (patch) | |
| tree | 87b97a802af4d7c148672e4ff71f4c7564a3c4b2 | |
| parent | 371db1e4e3c725823f849fcbe1073671ed573d21 (diff) | |
gcc/
2014-11-14 Michael Collison <michael.collison@linaro.org>
Backport from trunk r212178..
2014-06-30 Joseph Myers <joseph@codesourcery.com>
* var-tracking.c (add_stores): Return instead of asserting if old
and new values for conditional store are the same.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_8-branch@217555 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.linaro | 8 | ||||
| -rw-r--r-- | gcc/var-tracking.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro index cf78c691c7b..21fe5d42103 100644 --- a/gcc/ChangeLog.linaro +++ b/gcc/ChangeLog.linaro @@ -1,3 +1,11 @@ +2014-11-14 Michael Collison <michael.collison@linaro.org> + + Backport from trunk r212178.. + 2014-06-30 Joseph Myers <joseph@codesourcery.com> + + * 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 <yvan.roux@linaro.org> Add Linaro release macros (Linaro only patch.) diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 0db15625b70..fe1ce6070d7 100644 --- a/gcc/var-tracking.c +++ b/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)) |