From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 5 Jan 2012 00:29:13 +0000 (+0100)
Subject: re PR debug/51746 (Segfault in cselib_preserved_value_p)
X-Git-Tag: releases/gcc-4.7.0~1174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbd651333df334be66eb2160e22cfeb84377fba7;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d9bc63654c4..a30063a915aa 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 27bff38751c5..557a2ca41dcf 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;