From 5950480cd0d48752ca3e11e07a4f5a1d312873b7 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 29 Mar 2013 23:12:33 +0000 Subject: [PATCH] call.c (build_op_call_1): Use TYPE_PTRFN_P and TYPE_REFFN_P. 2013-03-29 Paolo Carlini * call.c (build_op_call_1): Use TYPE_PTRFN_P and TYPE_REFFN_P. From-SVN: r197253 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/call.c | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 16ea0743d6e..dacc0f91065 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2013-03-29 Paolo Carlini + + * call.c (build_op_call_1): Use TYPE_PTRFN_P and TYPE_REFFN_P. + 2013-03-29 Paolo Carlini * call.c (add_builtin_candidate): Use TYPE_PTR_P and VOID_TYPE_P. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 1c368ca8ce8..5df6b475c83 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4082,13 +4082,10 @@ build_op_call_1 (tree obj, vec **args, tsubst_flags_t complain) tree fns = TREE_VALUE (convs); tree totype = TREE_TYPE (convs); - if ((TYPE_PTR_P (totype) - && TREE_CODE (TREE_TYPE (totype)) == FUNCTION_TYPE) + if (TYPE_PTRFN_P (totype) + || TYPE_REFFN_P (totype) || (TREE_CODE (totype) == REFERENCE_TYPE - && TREE_CODE (TREE_TYPE (totype)) == FUNCTION_TYPE) - || (TREE_CODE (totype) == REFERENCE_TYPE - && TYPE_PTR_P (TREE_TYPE (totype)) - && TREE_CODE (TREE_TYPE (TREE_TYPE (totype))) == FUNCTION_TYPE)) + && TYPE_PTRFN_P (TREE_TYPE (totype)))) for (; fns; fns = OVL_NEXT (fns)) { tree fn = OVL_CURRENT (fns);