From: Martin Jambor <mjambor@suse.cz>
Date: Fri, 14 Mar 2014 10:49:05 +0000 (+0100)
Subject: re PR lto/60461 (LTO linking error at -Os (and above) on x86_64-linux-gnu)
X-Git-Tag: releases/gcc-4.9.0~455
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d354792e623c04384497eb5f9c06e0c87f49a19;p=thirdparty%2Fgcc.git

re PR lto/60461 (LTO linking error at -Os (and above) on x86_64-linux-gnu)

2014-03-13  Martin Jambor  <mjambor@suse.cz>

	PR lto/60461
	* ipa-prop.c (ipa_modify_call_arguments): Fix iteration condition
	and simplify it.

testsuite/
	* gcc.dg/lto/pr60461_0.c: New test.

From-SVN: r208566
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f20c9de4bf18..b2c7072cc204 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-13  Martin Jambor  <mjambor@suse.cz>
+
+	PR lto/60461
+	* ipa-prop.c (ipa_modify_call_arguments): Fix iteration condition
+	and simplify it.
+
 2014-03-14  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR target/59396
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 4fb916aa01fd..9f144fa34428 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -3900,8 +3900,7 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt,
       ipa_record_stmt_references (current_node, gsi_stmt (gsi));
       gsi_prev (&gsi);
     }
-  while ((gsi_end_p (prev_gsi) && !gsi_end_p (gsi))
-	 || (!gsi_end_p (prev_gsi) && gsi_stmt (gsi) == gsi_stmt (prev_gsi)));
+  while (gsi_stmt (gsi) != gsi_stmt (prev_gsi));
 }
 
 /* If the expression *EXPR should be replaced by a reduction of a parameter, do
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0268eb697106..7f7c9743567f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-13  Martin Jambor  <mjambor@suse.cz>
+
+	PR lto/60461
+	* gcc.dg/lto/pr60461_0.c: New test.
+
 2014-03-14  Cesar Philippidis  <cesar@codesourcery.com>
 
 	* lib/gcc-dg.exp (cleanup-saved-temps): Handle LTO temporaries.
diff --git a/gcc/testsuite/gcc.dg/lto/pr60461_0.c b/gcc/testsuite/gcc.dg/lto/pr60461_0.c
new file mode 100644
index 000000000000..cad6a8de85b1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr60461_0.c
@@ -0,0 +1,37 @@
+/* { dg-lto-do link } */
+/* { dg-lto-options {{-Os -flto} } } */
+
+
+struct S
+{
+  int f1;
+  int f2;
+} a[1] = { {0, 0} }; 
+
+int b, c;
+
+static unsigned short fn1 (struct S);
+
+void
+fn2 ()
+{
+  for (; c;)
+    ;
+  b = 0;
+  fn1 (a[0]);
+}
+
+unsigned short
+fn1 (struct S p)
+{
+  if (p.f1)
+    fn2 ();
+  return 0;
+}
+
+int
+main ()
+{
+  fn2 ();
+  return 0;
+}