From c2152239ace246c45e1ec2b50af196762d18782a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 12 Jan 2009 12:11:40 +0100 Subject: [PATCH] re PR tree-optimization/38807 (ice: gimple check: expected gimple_assign(error_mark), have gimple_phi()) PR tree-optimization/38807 * tree-ssa-reassoc.c (remove_visited_stmt_chain): Don't look at gimple_visited_p unless stmt is GIMPLE_ASSIGN. * gcc.c-torture/compile/pr38807.c: New test. From-SVN: r143289 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.c-torture/compile/pr38807.c | 23 +++++++++++++++++++ gcc/tree-ssa-reassoc.c | 5 ++-- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr38807.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ba53e7df4cc..715cbfb9485 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-01-12 Jakub Jelinek + + PR tree-optimization/38807 + * tree-ssa-reassoc.c (remove_visited_stmt_chain): Don't look at + gimple_visited_p unless stmt is GIMPLE_ASSIGN. + 2009-01-11 Adam Nemet * expmed.c (store_bit_field_1): Properly truncate the paradoxical diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 41f53a92da6..260504aa865 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-01-12 Jakub Jelinek + + PR tree-optimization/38807 + * gcc.c-torture/compile/pr38807.c: New test. + 2009-01-11 Adam Nemet * gcc.target/mips/ins-2.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/compile/pr38807.c b/gcc/testsuite/gcc.c-torture/compile/pr38807.c new file mode 100644 index 00000000000..8b05d08aa72 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr38807.c @@ -0,0 +1,23 @@ +/* PR tree-optimization/38807 */ + +int +baz (short x) +{ + return x; +} + +int a, b; + +int +bar (int x) +{ + if (baz (a ^ x ^ a)) + return b; + return 0; +} + +int +foo (void) +{ + return bar (a == 0 || 1 == 1 - a) ? 1 : bar (1 && a); +} diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index d539398c5c7..d28e1b620ff 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -1,5 +1,5 @@ /* Reassociation for trees. - Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Contributed by Daniel Berlin This file is part of GCC. @@ -1279,7 +1279,8 @@ remove_visited_stmt_chain (tree var) if (TREE_CODE (var) != SSA_NAME || !has_zero_uses (var)) return; stmt = SSA_NAME_DEF_STMT (var); - if (!gimple_visited_p (stmt)) + if (!is_gimple_assign (stmt) + || !gimple_visited_p (stmt)) return; var = gimple_assign_rhs1 (stmt); gsi = gsi_for_stmt (stmt); -- 2.30.2