From 764ded997f5a0fb5ba0f65a5d537b63ff140203c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Jun 2018 19:28:32 +0200 Subject: [PATCH] backport: re PR tree-optimization/84739 (ICE in get_value_for_expr, at tree-ssa-ccp.c:649) Backported from mainline 2018-03-08 Jakub Jelinek PR tree-optimization/84739 * tree-tailcall.c (find_tail_calls): Check call arguments against DECL_ARGUMENTS (current_function_decl) rather than DECL_ARGUMENTS (func) when checking for tail recursion. * gcc.dg/pr84739.c: New test. From-SVN: r262071 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr84739.c | 26 ++++++++++++++++++++++++++ gcc/tree-tailcall.c | 2 +- 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr84739.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 05359d44f500..8903a771e3f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,13 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2018-03-08 Jakub Jelinek + + PR tree-optimization/84739 + * tree-tailcall.c (find_tail_calls): Check call arguments against + DECL_ARGUMENTS (current_function_decl) rather than + DECL_ARGUMENTS (func) when checking for tail recursion. + 2018-03-05 Jakub Jelinek PR target/84700 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9da363f67f17..48022ed15b6a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2018-03-08 Jakub Jelinek + + PR tree-optimization/84739 + * gcc.dg/pr84739.c: New test. + 2018-03-05 Jakub Jelinek PR target/84700 diff --git a/gcc/testsuite/gcc.dg/pr84739.c b/gcc/testsuite/gcc.dg/pr84739.c new file mode 100644 index 000000000000..9864f990b0cf --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr84739.c @@ -0,0 +1,26 @@ +/* PR tree-optimization/84739 */ +/* { dg-do compile } */ +/* { dg-require-weak "" } */ +/* { dg-options "-O2 -w" } */ + +static void baz (void) __attribute__((weakref("bar"))); + +int +foo (int x, int y) +{ + if (x) + y = 0; + if (y) + goto lab; + y = 0; +lab: + return y; +} + +void +bar (int x, int y) +{ + y = foo (x, y); + if (y != 0) + baz (); +} diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c index 0436f0f04a64..d7997688ec03 100644 --- a/gcc/tree-tailcall.c +++ b/gcc/tree-tailcall.c @@ -467,7 +467,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret) { tree arg; - for (param = DECL_ARGUMENTS (func), idx = 0; + for (param = DECL_ARGUMENTS (current_function_decl), idx = 0; param && idx < gimple_call_num_args (call); param = DECL_CHAIN (param), idx ++) { -- 2.47.2