From 949e47e5767ae98fe1f30b1b632d02fe8f553abe Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 21 Feb 2012 10:24:42 +0100 Subject: [PATCH] re PR tree-optimization/52318 (ICE: in execute_todo, at passes.c:1748 with -O3 -ftracer -fno-tree-ccp -fno-tree-copy-prop -fno-tree-dce and stpcpy_chk()) PR tree-optimization/52318 * gimple-fold.c (gimplify_and_update_call_from_tree): Add vdef also to non-pure/const call stmts in the sequence. * gcc.dg/pr52318.c: New test. From-SVN: r184428 --- gcc/ChangeLog | 6 ++++++ gcc/gimple-fold.c | 9 ++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr52318.c | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr52318.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df2419a5b45..ea84649ff0a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-02-21 Jakub Jelinek + + PR tree-optimization/52318 + * gimple-fold.c (gimplify_and_update_call_from_tree): Add + vdef also to non-pure/const call stmts in the sequence. + 2012-02-20 David S. Miller * config/sparc/sparc.md (load_pcrel_sym): Explain why we diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 935bbdae9ee..eae4cbe4615 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -1,5 +1,5 @@ /* Statement simplification on GIMPLE. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc. Split out from tree-ssa-ccp.c. This file is part of GCC. @@ -591,8 +591,11 @@ gimplify_and_update_call_from_tree (gimple_stmt_iterator *si_p, tree expr) for (i = gsi_last (stmts); !gsi_end_p (i); gsi_prev (&i)) { new_stmt = gsi_stmt (i); - if (gimple_assign_single_p (new_stmt) - && !is_gimple_reg (gimple_assign_lhs (new_stmt))) + if ((gimple_assign_single_p (new_stmt) + && !is_gimple_reg (gimple_assign_lhs (new_stmt))) + || (is_gimple_call (new_stmt) + && (gimple_call_flags (new_stmt) + & (ECF_NOVOPS | ECF_PURE | ECF_CONST | ECF_NORETURN)) == 0)) { tree vdef; if (!laststore) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index df818afcaeb..2bbb672a3d4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-02-21 Jakub Jelinek + + PR tree-optimization/52318 + * gcc.dg/pr52318.c: New test. + 2012-02-20 Kai Tietz * gcc.dg/bf-ms-layout-3.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/pr52318.c b/gcc/testsuite/gcc.dg/pr52318.c new file mode 100644 index 00000000000..4f367aa1cd4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr52318.c @@ -0,0 +1,17 @@ +/* PR tree-optimization/52318 */ +/* { dg-do compile } */ +/* { dg-options "-O3 -ftracer -fno-tree-ccp -fno-tree-copy-prop -fno-tree-dce" } */ + +int c; +char *p; + +void +foo (int i) +{ + char a[2]; + char b[20]; + p = __builtin___stpcpy_chk (a, "", 2); + p = __builtin___stpcpy_chk (&b[16], i ? "e" : "jkl", 4); + if (c) + foo (i); +} -- 2.30.2