diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-12-19 20:33:28 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-12-19 20:33:28 +0100 |
| commit | 6cea69fe29484257a395993304afa4c7c930c4db (patch) | |
| tree | 0e5a4f67463b37b8fef4534316b39159b6abc24c /gcc | |
| parent | 735baa21c2d66b18a6b32fc96a176b57a93cddae (diff) | |
| download | gcc-6cea69fe29484257a395993304afa4c7c930c4db.zip gcc-6cea69fe29484257a395993304afa4c7c930c4db.tar.gz gcc-6cea69fe29484257a395993304afa4c7c930c4db.tar.bz2 | |
re PR c++/38577 (ICE: tree check: expected call_expr, have compound_expr in build_new_method_call, at cp/call.c:6000)
PR c++/38577
* call.c (build_new_method_call): Handle call being COMPOUND_EXPR
or NOP_EXPR.
* g++.dg/template/call6.C: New test.
From-SVN: r142842
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/call.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/call6.C | 24 |
4 files changed, 46 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0a84812..ad0506a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-12-19 Jakub Jelinek <jakub@redhat.com> + + PR c++/38577 + * call.c (build_new_method_call): Handle call being COMPOUND_EXPR + or NOP_EXPR. + 2008-12-18 Jakub Jelinek <jakub@redhat.com> PR c++/38427 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 952e151..09dc57d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5993,6 +5993,15 @@ build_new_method_call (tree instance, tree fns, tree args, if (processing_template_decl && call != error_mark_node) { + bool cast_to_void = false; + + if (TREE_CODE (call) == COMPOUND_EXPR) + call = TREE_OPERAND (call, 1); + else if (TREE_CODE (call) == NOP_EXPR) + { + cast_to_void = true; + call = TREE_OPERAND (call, 0); + } if (TREE_CODE (call) == INDIRECT_REF) call = TREE_OPERAND (call, 0); call = (build_min_non_dep_call_list @@ -6001,6 +6010,8 @@ build_new_method_call (tree instance, tree fns, tree args, orig_instance, orig_fns, NULL_TREE), orig_args)); call = convert_from_reference (call); + if (cast_to_void) + call = build_nop (void_type_node, call); } /* Free all the conversions we allocated. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1337b47..eae3cc3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-12-19 Jakub Jelinek <jakub@redhat.com> + + PR c++/38577 + * g++.dg/template/call6.C: New test. + 2008-12-19 Janis Johnson <janis187@us.ibm.com> Revert: diff --git a/gcc/testsuite/g++.dg/template/call6.C b/gcc/testsuite/g++.dg/template/call6.C new file mode 100644 index 0000000..b79d624 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/call6.C @@ -0,0 +1,24 @@ +// PR c++/38577 +// { dg-do compile } + +struct A +{ + static A *bar (); +}; + +struct B : public A +{ + static void baz (); +}; + +template <class T> +void foo () +{ + (static_cast<B *> (A::bar ()))->baz (); +} + +void +bar () +{ + foo<int> (); +} |