From: mkuvyrkov <mkuvyrkov@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 28 Jul 2010 16:50:14 +0000 (+0000)
Subject: 	PR rtl-optimization/45107
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=025406442d5fb4d840630da0da177c300b264750

	PR rtl-optimization/45107
	* gcse.c (hash_scan_set): Use max_distance for gcse-las.

	PR rtl-optimization/45107
	* gcc.dg/pr45107.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162645 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 599176dfe84..5e8721d3602 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-28  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	PR rtl-optimization/45107
+	* gcse.c (hash_scan_set): Use max_distance for gcse-las.
+
 2010-07-28  Richard Guenther  <rguenther@suse.de>
 
 	* tree-ssa-ccp.c: Remove comment regarding STORE-CCP.
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 112413112f1..6e923f9d572 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -1471,6 +1471,7 @@ hash_scan_set (rtx pat, rtx insn, struct hash_table_d *table)
   else if (flag_gcse_las && REG_P (src) && MEM_P (dest))
       {
         unsigned int regno = REGNO (src);
+	int max_distance = 0;
 
         /* Do not do this for constant/copy propagation.  */
         if (! table->set_p
@@ -1482,7 +1483,7 @@ hash_scan_set (rtx pat, rtx insn, struct hash_table_d *table)
 	      do that easily for EH edges so disable GCSE on these for now.  */
 	   && !can_throw_internal (insn)
 	   /* Is SET_DEST something we want to gcse?  */
-	   && want_to_gcse_p (dest, NULL)
+	   && want_to_gcse_p (dest, &max_distance)
 	   /* Don't CSE a nop.  */
 	   && ! set_noop_p (pat)
 	   /* Don't GCSE if it has attached REG_EQUIV note.
@@ -1504,7 +1505,7 @@ hash_scan_set (rtx pat, rtx insn, struct hash_table_d *table)
 
 	       /* Record the memory expression (DEST) in the hash table.  */
 	       insert_expr_in_table (dest, GET_MODE (dest), insn,
-				     antic_p, avail_p, 0, table);
+				     antic_p, avail_p, max_distance, table);
              }
       }
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 21ca910291f..3dbe0285108 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2010-07-28  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
+	PR rtl-optimization/45107
+	* gcc.dg/pr45107.c: New test.
+
+2010-07-28  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
 	PR rtl-optimization/45101
 	* gcc.dg/pr45101.c: New test.
 
diff --git a/gcc/testsuite/gcc.dg/pr45107.c b/gcc/testsuite/gcc.dg/pr45107.c
new file mode 100644
index 00000000000..05dbec32177
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr45107.c
@@ -0,0 +1,13 @@
+/* PR rtl-optimization/45107 */
+/* { dg-do compile } */
+/* { dg-options "-Os -fgcse-las" } */
+
+extern void bar(int *);
+
+int foo (int *p)
+{
+    int i = *p;
+    if (i != 1)
+      bar(&i);
+    *p = i;
+}