From c535d827f7b28daa38024e34902b30211a79d087 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 20 Apr 2011 22:56:39 -0400 Subject: [PATCH] re PR c++/48594 (Rejects valid with pointer-to-member in template) PR c++/48594 * decl2.c (build_offset_ref_call_from_tree): Fix calling a functor or pointer to (non-member) function. From-SVN: r172803 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl2.c | 14 ++++++++---- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/template/operator11.C | 25 ++++++++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/operator11.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2441d6522b2f..00542f91bf88 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-04-20 Jason Merrill + + PR c++/48594 + * decl2.c (build_offset_ref_call_from_tree): Fix calling a functor + or pointer to (non-member) function. + 2011-04-19 Jason Merrill PR c++/46304 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 90adc68c4932..d27ed433d4da 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3911,9 +3911,12 @@ build_offset_ref_call_from_tree (tree fn, VEC(tree,gc) **args) because we depend on the form of FN. */ make_args_non_dependent (*args); object = build_non_dependent_expr (object); - if (TREE_CODE (fn) == DOTSTAR_EXPR) - object = cp_build_unary_op (ADDR_EXPR, object, 0, tf_warning_or_error); - VEC_safe_insert (tree, gc, *args, 0, object); + if (TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE) + { + if (TREE_CODE (fn) == DOTSTAR_EXPR) + object = cp_build_unary_op (ADDR_EXPR, object, 0, tf_warning_or_error); + VEC_safe_insert (tree, gc, *args, 0, object); + } /* Now that the arguments are done, transform FN. */ fn = build_non_dependent_expr (fn); } @@ -3933,7 +3936,10 @@ build_offset_ref_call_from_tree (tree fn, VEC(tree,gc) **args) VEC_safe_insert (tree, gc, *args, 0, object_addr); } - expr = cp_build_function_call_vec (fn, args, tf_warning_or_error); + if (CLASS_TYPE_P (TREE_TYPE (fn))) + expr = build_op_call (fn, args, tf_warning_or_error); + else + expr = cp_build_function_call_vec (fn, args, tf_warning_or_error); if (processing_template_decl && expr != error_mark_node) expr = build_min_non_dep_call_vec (expr, orig_fn, orig_args); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 253c8321769a..133776ef7305 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-04-20 Jason Merrill + + * g++.dg/template/operator11.C: New. + 2011-04-19 Jason Merrill * g++.dg/ext/complex7.C: New. diff --git a/gcc/testsuite/g++.dg/template/operator11.C b/gcc/testsuite/g++.dg/template/operator11.C new file mode 100644 index 000000000000..8d6b77ab4541 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/operator11.C @@ -0,0 +1,25 @@ +// PR c++/48594 +// Test for uses of (X->*Y)() that don't actually involve a +// pointer to member function. + +struct A { } a; +struct B { } b; +struct C * cp; + +struct Func { void operator()(); }; +Func operator->* (A, int); + +typedef void (*pfn)(); +pfn operator->* (B, int); + +pfn C::*cpfn; +Func C::*cfunc; + +template +void f() +{ + (a->*1)(); + (b->*1)(); + (cp->*cpfn)(); + (cp->*cfunc)(); +} -- 2.47.2