From 61b70fcb8c1015ea3ab5c95aef41b23100579ec0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 30 Sep 2008 19:00:49 +0200 Subject: [PATCH] re PR tree-optimization/37662 (ice: tree check: expected ssa_name, have integer_cst in get_value_range, at tree-vrp.c:612) PR tree-optimization/37662 PR tree-optimization/37663 * tree-vrp.c (simplify_truth_ops_using_ranges): Don't call get_value_range with non-SSA_NAME. Don't assert operands have been folded, instead just bail out. * gcc.c-torture/compile/pr37662.c: New test. * gcc.dg/pr37663.c: New test. From-SVN: r140792 --- gcc/ChangeLog | 8 ++++++++ gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.c-torture/compile/pr37662.c | 15 +++++++++++++++ gcc/testsuite/gcc.dg/pr37663.c | 15 +++++++++++++++ gcc/tree-vrp.c | 18 +++++++++++++----- 5 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr37662.c create mode 100644 gcc/testsuite/gcc.dg/pr37663.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 412bded983e..ba26097f14b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-09-30 Jakub Jelinek + + PR tree-optimization/37662 + PR tree-optimization/37663 + * tree-vrp.c (simplify_truth_ops_using_ranges): Don't call + get_value_range with non-SSA_NAME. Don't assert operands have been + folded, instead just bail out. + 2008-09-30 Andrew Pinski * config/rs6000/rs6000.md (fnmadds combiner): Revert typo. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 02eb3b3cd82..fe699e392fb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-09-30 Jakub Jelinek + + PR tree-optimization/37662 + PR tree-optimization/37663 + * gcc.c-torture/compile/pr37662.c: New test. + * gcc.dg/pr37663.c: New test. + 2008-09-30 Janus Weil PR fortran/36592 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr37662.c b/gcc/testsuite/gcc.c-torture/compile/pr37662.c new file mode 100644 index 00000000000..f6977438e73 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr37662.c @@ -0,0 +1,15 @@ +/* PR tree-optimization/37662 */ + +extern int baz (void); + +static int +foo (void) +{ + return 1; +} + +int +bar (void) +{ + return foo () >= 1 ^ (baz () || 0) || 0; +} diff --git a/gcc/testsuite/gcc.dg/pr37663.c b/gcc/testsuite/gcc.dg/pr37663.c new file mode 100644 index 00000000000..05488ebb708 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr37663.c @@ -0,0 +1,15 @@ +/* PR tree-optimization/37663 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fwrapv" } */ + +extern void bar (void); + +void +foo (int x) +{ + x = 1 >= x; + int y = -1885403717; + x = x + (x != y * y); + if (x) + bar (); +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index fbcda55fc2a..4f1c3288ce7 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -6304,9 +6304,12 @@ simplify_truth_ops_using_ranges (gimple_stmt_iterator *gsi, gimple stmt) bool need_conversion; op0 = gimple_assign_rhs1 (stmt); - vr = get_value_range (op0); if (TYPE_PRECISION (TREE_TYPE (op0)) != 1) { + if (TREE_CODE (op0) != SSA_NAME) + return false; + vr = get_value_range (op0); + val = compare_range_with_value (GE_EXPR, vr, integer_zero_node, &sop); if (!val || !integer_onep (val)) return false; @@ -6329,10 +6332,15 @@ simplify_truth_ops_using_ranges (gimple_stmt_iterator *gsi, gimple stmt) if (is_gimple_min_invariant (op1)) { /* Exclude anything that should have been already folded. */ - gcc_assert (rhs_code == EQ_EXPR || rhs_code == NE_EXPR - || rhs_code == TRUTH_XOR_EXPR); - gcc_assert (integer_zerop (op1) || integer_onep (op1) - || integer_all_onesp (op1)); + if (rhs_code != EQ_EXPR + && rhs_code != NE_EXPR + && rhs_code != TRUTH_XOR_EXPR) + return false; + + if (!integer_zerop (op1) + && !integer_onep (op1) + && !integer_all_onesp (op1)) + return false; /* Limit the number of cases we have to consider. */ if (rhs_code == EQ_EXPR) -- 2.30.2