diff options
| author | Martin Jambor <mjambor@suse.cz> | 2009-10-13 13:31:08 +0200 |
|---|---|---|
| committer | Martin Jambor <jamborm@gcc.gnu.org> | 2009-10-13 13:31:08 +0200 |
| commit | c4e5fe4b51a5228f734ddf76e680dd9088d59a55 (patch) | |
| tree | c366eb26ee9527581ae826e651347c89c8a66cbd /gcc | |
| parent | 3525f49b5a8794cd0b553a53f6d1617cbb6b8c55 (diff) | |
| download | gcc-c4e5fe4b51a5228f734ddf76e680dd9088d59a55.zip gcc-c4e5fe4b51a5228f734ddf76e680dd9088d59a55.tar.gz gcc-c4e5fe4b51a5228f734ddf76e680dd9088d59a55.tar.bz2 | |
re PR tree-optimization/41661 (ICE due to IPCP trying to create/fold a REAL typed comparision)
2009-10-13 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/41661
* ipa-prop.c (compute_complex_pass_through): Allow only operations
that are tcc_comparisons or do not change the type in any
un-usleless way.
* ipa-cp.c (ipcp_lattice_from_jfunc): Request boolean type when
folding tcc_comparison operations.
* testsuite/gcc.c-torture/compile/pr41661.c: New test.
From-SVN: r152702
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ipa-cp.c | 13 | ||||
| -rw-r--r-- | gcc/ipa-prop.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr41661.c | 20 |
5 files changed, 46 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 495e192..c60bd48 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2009-10-13 Martin Jambor <mjambor@suse.cz> + + PR tree-optimization/41661 + * ipa-prop.c (compute_complex_pass_through): Allow only operations + that are tcc_comparisons or do not change the type in any + un-usleless way. + * ipa-cp.c (ipcp_lattice_from_jfunc): Request boolean type when + folding tcc_comparison operations. + 2009-10-13 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * config/s390/s390.c (s390_encode_section_info): Handle BLKmode diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index 59a0519..7e499ca 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -299,9 +299,16 @@ ipcp_lattice_from_jfunc (struct ipa_node_params *info, struct ipcp_lattice *lat, cst = caller_lat->constant; if (jfunc->value.pass_through.operation != NOP_EXPR) - cst = fold_binary (jfunc->value.pass_through.operation, - TREE_TYPE (cst), cst, - jfunc->value.pass_through.operand); + { + tree restype; + if (TREE_CODE_CLASS (jfunc->value.pass_through.operation) + == tcc_comparison) + restype = boolean_type_node; + else + restype = TREE_TYPE (cst); + cst = fold_binary (jfunc->value.pass_through.operation, + restype, cst, jfunc->value.pass_through.operand); + } if (!cst || !is_gimple_ip_invariant (cst)) lat->type = IPA_BOTTOM; lat->constant = cst; diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 0e6aaf5..93c407b 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -357,6 +357,9 @@ compute_complex_pass_through (struct ipa_node_params *info, { if (TREE_CODE (op1) != SSA_NAME || !SSA_NAME_IS_DEFAULT_DEF (op1) + || (TREE_CODE_CLASS (gimple_expr_code (stmt)) != tcc_comparison + && !useless_type_conversion_p (TREE_TYPE (name), + TREE_TYPE (op1))) || !is_gimple_ip_invariant (op2)) return; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2303589..8e53af9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-10-13 Martin Jambor <mjambor@suse.cz> + + * gcc.c-torture/compile/pr41661.c: New test. + 2009-10-12 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libgfortran/41683 diff --git a/gcc/testsuite/gcc.c-torture/compile/pr41661.c b/gcc/testsuite/gcc.c-torture/compile/pr41661.c new file mode 100644 index 0000000..658e428 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr41661.c @@ -0,0 +1,20 @@ +/* PR tree-optimization/41661 */ +/* { dg-do compile } */ +/* { dg-options "-fno-early-inlining" } */ + +int g; + +void foo (int x) +{ + g = x; +} + +void bar (double d) +{ + foo (d == 1); +} + +void baz (int a) +{ + bar (1); +} |