From 8e480ec1ddb307150cb36cf610b9eeab591de216 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 4 Mar 2020 09:01:59 +0100 Subject: [PATCH] tailcall: Fix up process_assignment [PR94001] When a function returns void or the return value is ignored, ass_var is NULL_TREE. The tail recursion handling generally assumes DCE has been performed and so doesn't expect to encounter useless assignments after the call and expects them to be part of the return value adjustment that need to be changed into tail recursion additions/multiplications. process_assignment does some verification and has a way to tell the caller to try to move dead or whatever other stmts that don't participate in the return value modifications before it is returned. For binary rhs assignments it is just fine, neither op0 nor op1 will be NULL_TREE and thus if *ass_var is NULL_TREE, it will not match, but unary rhs is handled by only setting op0 to rhs1 and setting op1 to NULL_TREE. And at this point, NULL_TREE == NULL_TREE and thus we think e.g. the c_2 = -e_3(D); dead stmt is actually a return value modification, so we queue it as multiplication and then create a void type SSA_NAME accumulator for it and ICE shortly after. Fixed by making sure op1 == *ass_var comparison is done only if *ass_var. 2020-03-04 Jakub Jelinek PR tree-optimization/94001 * tree-tailcall.c (process_assignment): Before comparing op1 to *ass_var, verify *ass_var is non-NULL. * gcc.dg/pr94001.c: New test. --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr94001.c | 11 +++++++++++ gcc/tree-tailcall.c | 3 ++- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr94001.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 42f417abb27..caa854d5a43 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-03-04 Jakub Jelinek + + PR tree-optimization/94001 + * tree-tailcall.c (process_assignment): Before comparing op1 to + *ass_var, verify *ass_var is non-NULL. + 2020-03-04 Kito Cheng PR target/93995 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cd519f4116b..a13a0a4ba59 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-04 Jakub Jelinek + + PR tree-optimization/94001 + * gcc.dg/pr94001.c: New test. + 2020-03-04 Kito Cheng PR target/93995 diff --git a/gcc/testsuite/gcc.dg/pr94001.c b/gcc/testsuite/gcc.dg/pr94001.c new file mode 100644 index 00000000000..f83873fa2bd --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr94001.c @@ -0,0 +1,11 @@ +/* PR tree-optimization/94001 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-tree-dce" } */ + +void +bar (int e) +{ + bar (3); + int c; + c = -e; +} diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c index 9ffe739f601..d81e9213460 100644 --- a/gcc/tree-tailcall.c +++ b/gcc/tree-tailcall.c @@ -339,7 +339,8 @@ process_assignment (gassign *stmt, && (non_ass_var = independent_of_stmt_p (op1, stmt, call, to_move))) ; - else if (op1 == *ass_var + else if (*ass_var + && op1 == *ass_var && (non_ass_var = independent_of_stmt_p (op0, stmt, call, to_move))) ; -- 2.30.2