From: Alexandre Oliva <aoliva@redhat.com>
Date: Thu, 6 Mar 2014 07:04:47 +0000 (+0000)
Subject: re PR debug/60381 (ICE: in vt_expand_var_loc_chain, at var-tracking.c:8245)
X-Git-Tag: releases/gcc-4.9.0~561
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80662856d25b4819a2323c1cbcdf35df85e3dfa2;p=thirdparty%2Fgcc.git

re PR debug/60381 (ICE: in vt_expand_var_loc_chain, at var-tracking.c:8245)

PR debug/60381
Revert:
2014-02-28  Alexandre Oliva <aoliva@redhat.com>
PR debug/59992
* cselib.c (remove_useless_values): Skip to avoid quadratic
behavior if the condition moved from...
(cselib_process_insn): ... here holds.

From-SVN: r208361
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b71499da442e..f231dd4f8d9a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-06  Alexandre Oliva <aoliva@redhat.com>
+
+	PR debug/60381
+	Revert:
+	2014-02-28  Alexandre Oliva <aoliva@redhat.com>
+	PR debug/59992
+	* cselib.c (remove_useless_values): Skip to avoid quadratic
+	behavior if the condition moved from...
+	(cselib_process_insn): ... here holds.
+
 2014-03-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR plugins/59335
diff --git a/gcc/cselib.c b/gcc/cselib.c
index 0fcfe285eb51..4dfc55778b92 100644
--- a/gcc/cselib.c
+++ b/gcc/cselib.c
@@ -681,14 +681,6 @@ remove_useless_values (void)
 {
   cselib_val **p, *v;
 
-  if (n_useless_values <= MAX_USELESS_VALUES
-      /* remove_useless_values is linear in the hash table size.  Avoid
-         quadratic behavior for very large hashtables with very few
-	 useless elements.  */
-      || ((unsigned int)n_useless_values
-	  <= (cselib_hash_table.elements () - n_debug_values) / 4))
-    return;
-
   /* First pass: eliminate locations that reference the value.  That in
      turn can make more values useless.  */
   do
@@ -2720,7 +2712,13 @@ cselib_process_insn (rtx insn)
 
   cselib_current_insn = NULL_RTX;
 
-  remove_useless_values ();
+  if (n_useless_values > MAX_USELESS_VALUES
+      /* remove_useless_values is linear in the hash table size.  Avoid
+         quadratic behavior for very large hashtables with very few
+	 useless elements.  */
+      && ((unsigned int)n_useless_values
+	  > (cselib_hash_table.elements () - n_debug_values) / 4))
+    remove_useless_values ();
 }
 
 /* Initialize cselib for one pass.  The caller must also call