aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2014-01-06 15:05:25 +0100
committerMartin Jambor <jamborm@gcc.gnu.org>2014-01-06 15:05:25 +0100
commita4e33812b0fe66f2d868d299b9b1fff0f0e84905 (patch)
tree2e6a36d3e13056bf41c373c2d8010dec7a926f93 /gcc
parent4dc69bc674719454083318fd280bf061087940f4 (diff)
downloadgcc-a4e33812b0fe66f2d868d299b9b1fff0f0e84905.zip
gcc-a4e33812b0fe66f2d868d299b9b1fff0f0e84905.tar.gz
gcc-a4e33812b0fe66f2d868d299b9b1fff0f0e84905.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/ipa-cp.c2
-rw-r--r--gcc/ipa-prop.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/ipa/pr59008.c32
5 files changed, 46 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a810fa2..8a0c3f3 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 63c5037..a6a44e6 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 08be919..786a96f 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 ab3f2b0..7b7e558 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 0000000..b729672
--- /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
+ ;
+}