diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-01-05 01:29:13 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-01-05 01:29:13 +0100 |
| commit | cbd651333df334be66eb2160e22cfeb84377fba7 (patch) | |
| tree | 7ed483d2a4a54a89e76313cefcc761266b5e3d4b /gcc | |
| parent | 9b9d0043b9f6b6250897c2bc8e220d15cdb6d04b (diff) | |
| download | gcc-cbd651333df334be66eb2160e22cfeb84377fba7.zip gcc-cbd651333df334be66eb2160e22cfeb84377fba7.tar.gz gcc-cbd651333df334be66eb2160e22cfeb84377fba7.tar.bz2 | |
re PR debug/51746 (Segfault in cselib_preserved_value_p)
PR debug/51746
* var-tracking.c (add_stores): For COND_EXEC allow oval to be NULL.
From-SVN: r182897
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/var-tracking.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3d9bc63..a30063a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-01-05 Jakub Jelinek <jakub@redhat.com> + + PR debug/51746 + * var-tracking.c (add_stores): For COND_EXEC allow oval to be NULL. + 2012-01-04 Eric Botcazou <ebotcazou@adacore.com> PR tree-optimization/51624 diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 27bff38..557a2ca 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -1,5 +1,5 @@ /* Variable tracking routines for the GNU compiler. - Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GCC. @@ -5519,7 +5519,7 @@ add_stores (rtx loc, const_rtx expr, void *cuip) gcc_assert (oval != v); gcc_assert (REG_P (oloc) || MEM_P (oloc)); - if (!cselib_preserved_value_p (oval)) + if (oval && !cselib_preserved_value_p (oval)) { micro_operation moa; |