From 4c29307df9fef2001418b25babd1018a12d8687b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 12 Aug 2008 19:57:49 +0200 Subject: [PATCH] re PR tree-optimization/37084 (ICE in gimple_assign_rhs1) PR tree-optimization/37084 * tree-inline.c (copy_bb): Call gimple_regimplify_operands if id->regimplify, don't assume stmt is a cast assignment. * g++.dg/tree-ssa/pr37084.C: New test. From-SVN: r139028 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/tree-ssa/pr37084.C | 16 ++++++++++++++++ gcc/tree-inline.c | 7 +++---- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr37084.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b41d51b641..f60e34b232f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-08-12 Jakub Jelinek + + PR tree-optimization/37084 + * tree-inline.c (copy_bb): Call gimple_regimplify_operands + if id->regimplify, don't assume stmt is a cast assignment. + 2008-08-12 Anatoly Sokolov * final.c (final_scan_insn): Use app_enable/app_disable functions. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 427c066f40e..692e83f993c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Jakub Jelinek + + PR tree-optimization/37084 + * g++.dg/tree-ssa/pr37084.C: New test. + 2008-08-12 Ulrich Weigand * gcc.c-torture/execute/20031003-1.c (main): Update test to diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr37084.C b/gcc/testsuite/g++.dg/tree-ssa/pr37084.C new file mode 100644 index 00000000000..8fceb0cbbf3 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr37084.C @@ -0,0 +1,16 @@ +// PR tree-optimization/37084 +// { dg-do compile } +// { dg-options "-O" } + +struct A +{ + A (); +}; + +inline A +foo () +{ + return A (); +} + +const A a (foo ()); diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 4eeabb141b9..ef9e75c88c6 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1260,10 +1260,9 @@ copy_bb (copy_body_data *id, basic_block bb, int frequency_scale, /* With return slot optimization we can end up with non-gimple (foo *)&this->m, fix that here. */ - if ((is_gimple_assign (stmt) - && gimple_assign_rhs_code (stmt) == NOP_EXPR - && !is_gimple_val (gimple_assign_rhs1 (stmt))) - || id->regimplify) + if (is_gimple_assign (stmt) + && gimple_assign_rhs_code (stmt) == NOP_EXPR + && !is_gimple_val (gimple_assign_rhs1 (stmt))) { tree new_rhs; new_rhs = force_gimple_operand_gsi (©_gsi, -- 2.30.2