From: Martin Jambor <mjambor@suse.cz>
Date: Mon, 6 Jan 2014 14:05:25 +0000 (+0100)
Subject: re PR ipa/59008 (ICEs in try_make_edge_direct_simple_call / propagate_controlled_uses)
X-Git-Tag: releases/gcc-4.9.0~1822
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4e33812b0fe66f2d868d299b9b1fff0f0e84905;p=thirdparty%2Fgcc.git

re PR ipa/59008 (ICEs in try_make_edge_direct_simple_call / propagate_controlled_uses)

2014-01-06  Martin Jambor  <mjambor@suse.cz>

	PR ipa/59008
	* ipa-cp.c (ipcp_discover_new_direct_edges): Changed param_index type
	to int.
	* ipa-prop.c (ipa_print_node_params): Fix indentation.

testsuite/
        * gcc.dg/ipa/pr59008.c: New test.

From-SVN: r206361
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a810fa22c22b..8a0c3f3c42a8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-06  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/59008
+	* ipa-cp.c (ipcp_discover_new_direct_edges): Changed param_index type
+	to int.
+	* ipa-prop.c (ipa_print_node_params): Fix indentation.
+
 2014-01-06  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR debug/59350
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 63c50370a0a6..a6a44e6d81ac 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -2281,7 +2281,7 @@ ipcp_discover_new_direct_edges (struct cgraph_node *node,
 	{
 	  bool agg_contents = ie->indirect_info->agg_contents;
 	  bool polymorphic = ie->indirect_info->polymorphic;
-	  bool param_index = ie->indirect_info->param_index;
+	  int param_index = ie->indirect_info->param_index;
 	  struct cgraph_edge *cs = ipa_make_edge_direct_to_target (ie, target);
 	  found = true;
 
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 08be9199d992..786a96f8d334 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -3326,6 +3326,7 @@ ipa_print_node_params (FILE *f, struct cgraph_node *node)
     {
       int c;
 
+      fprintf (f, "    ");
       ipa_dump_param (f, info, i);
       if (ipa_is_param_used (info, i))
 	fprintf (f, " used");
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ab3f2b0dc7db..7b7e558923fa 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-06  Martin Jambor  <mjambor@suse.cz>
+
+	PR ipa/59008
+	* gcc.dg/ipa/pr59008.c: New test.
+
 2014-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* gcc.dg/vect/vect.exp: Add clearcap_ldflags to DEFAULT_VECTCFLAGS
diff --git a/gcc/testsuite/gcc.dg/ipa/pr59008.c b/gcc/testsuite/gcc.dg/ipa/pr59008.c
new file mode 100644
index 000000000000..b7296724300f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr59008.c
@@ -0,0 +1,32 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+typedef int (*funct)(int, int, int);
+
+extern int f(int, int, int);
+extern int g(int, int, int);
+extern int h(int, funct, funct);
+
+static int baz(int x, int y, int z)
+{
+  return x + y + z;
+}
+
+static int bar(int n, funct f1, funct f2)
+{
+  return h(n, f1, f2) + f1(0, 1, 2);
+}
+
+static int foo(int n, funct f1, funct f2)
+{
+  return bar(n, f1, f2) + f2(0, 1, 2);
+}
+
+int main(void)
+{
+  return foo(0, f, g)
+#ifndef ICE2
+   + foo(0, baz, g)
+#endif
+  ;
+}