From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 3 Jan 2012 20:57:29 +0000 (+0100)
Subject: re PR bootstrap/51725 (segfault in stage 3 when compiling gcc/opts.c for sparc64... 
X-Git-Tag: releases/gcc-4.7.0~1197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e30afafbbf5b4cf462c68c3e9e172c5989c7d85d;p=thirdparty%2Fgcc.git

re PR bootstrap/51725 (segfault in stage 3 when compiling gcc/opts.c for sparc64-linux)

	PR bootstrap/51725
	* cselib.c (new_elt_loc_list): When moving locs from one
	cselib_val to its new canonical_cselib_val and the
	cselib_val was in first_containing_mem chain, but
	the canonical_cselib_val was not, add the latter into the
	chain.
	(cselib_invalidate_mem): Compare canonical_cselib_val of
	addr_list chain elt with v.

From-SVN: r182858
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5f0b66346d5..b4c5fa1cf575 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,14 @@
 2012-01-03  Jakub Jelinek  <jakub@redhat.com>
 
+	PR bootstrap/51725
+	* cselib.c (new_elt_loc_list): When moving locs from one
+	cselib_val to its new canonical_cselib_val and the
+	cselib_val was in first_containing_mem chain, but
+	the canonical_cselib_val was not, add the latter into the
+	chain.
+	(cselib_invalidate_mem): Compare canonical_cselib_val of
+	addr_list chain elt with v.
+
 	PR pch/51722
 	* dwarf2out.c (dwarf2out_start_source_file, dwarf2out_define,
 	dwarf2out_undef): Allocate e.info using ggc_strdup instead
diff --git a/gcc/cselib.c b/gcc/cselib.c
index fc86ef1affeb..9934abb8f41f 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -277,6 +277,12 @@ new_elt_loc_list (cselib_val *val, rtx loc)
 	    }
 	  el->next = val->locs;
 	  next = val->locs = CSELIB_VAL_PTR (loc)->locs;
+	  if (CSELIB_VAL_PTR (loc)->next_containing_mem != NULL
+	      && val->next_containing_mem == NULL)
+	    {
+	      val->next_containing_mem = first_containing_mem;
+	      first_containing_mem = val;
+	    }
 	}
 
       /* Chain LOC back to VAL.  */
@@ -2211,7 +2217,7 @@ cselib_invalidate_mem (rtx mem_rtx)
 	  mem_chain = &addr->addr_list;
 	  for (;;)
 	    {
-	      if ((*mem_chain)->elt == v)
+	      if (canonical_cselib_val ((*mem_chain)->elt) == v)
 		{
 		  unchain_one_elt_list (mem_chain);
 		  break;