diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-07-17 12:40:09 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-07-17 12:40:09 +0200 |
| commit | 4f934809190163d548edbde5bae728bf954c5702 (patch) | |
| tree | a75510c3c3a02ad99a11e7939bdd46869d42a290 /gcc | |
| parent | e59be1b11960eb9b2a2fbb0b80b482508b704d3d (diff) | |
| download | gcc-4f934809190163d548edbde5bae728bf954c5702.zip gcc-4f934809190163d548edbde5bae728bf954c5702.tar.gz gcc-4f934809190163d548edbde5bae728bf954c5702.tar.bz2 | |
re PR c++/40780 (ICE in gimplify_conversion)
PR c++/40780
* gimplify.c (gimplify_conversion): Don't change non-conversions into
VIEW_CONVERT_EXPR.
* g++.dg/template/ptrmem19.C: New test.
From-SVN: r149740
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gimplify.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/ptrmem19.C | 19 |
4 files changed, 32 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9a61ea7..2d92626 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-07-17 Jakub Jelinek <jakub@redhat.com> + + PR c++/40780 + * gimplify.c (gimplify_conversion): Don't change non-conversions into + VIEW_CONVERT_EXPR. + 2009-07-16 Sandra Loosemore <sandra@codesourcery.com> * doc/extend.texi (Nested Functions): Replace broken link with diff --git a/gcc/gimplify.c b/gcc/gimplify.c index cd3de9d..db7de3b 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -1827,9 +1827,9 @@ gimplify_conversion (tree *expr_p) /* If we have a conversion to a non-register type force the use of a VIEW_CONVERT_EXPR instead. */ - if (!is_gimple_reg_type (TREE_TYPE (*expr_p))) + if (CONVERT_EXPR_P (*expr_p) && !is_gimple_reg_type (TREE_TYPE (*expr_p))) *expr_p = fold_build1_loc (loc, VIEW_CONVERT_EXPR, TREE_TYPE (*expr_p), - TREE_OPERAND (*expr_p, 0)); + TREE_OPERAND (*expr_p, 0)); return GS_OK; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19a26f7..fdd4d18 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-07-17 Jakub Jelinek <jakub@redhat.com> + + PR c++/40780 + * g++.dg/template/ptrmem19.C: New test. + 2009-07-17 Aldy Hernandez <aldyh@redhat.com> Manuel López-Ibáñez <manu@gcc.gnu.org> diff --git a/gcc/testsuite/g++.dg/template/ptrmem19.C b/gcc/testsuite/g++.dg/template/ptrmem19.C new file mode 100644 index 0000000..52711c6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ptrmem19.C @@ -0,0 +1,19 @@ +// PR c++/40780 +// { dg-do compile } + +template <class T1, typename T2, typename T3> +struct A +{ + typedef T2 (T1::*m) (T3); + A (m) {} +}; +struct B; +struct C +{ + void foo (B *); +}; +typedef A <C, void, B *> D; +typedef void (C::*E) (B *); +struct F; +typedef void (C::*G) (F); +D d ((E) (G) & C::foo); |