From 7e1352fe55aa8c9573c9a3e9e3d6d8eed3e879d6 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 6 May 2011 17:03:08 +0000 Subject: [PATCH] introduce {class,type}_of_this_parm functions introduce {class,type}_of_this_parm functions * cp-tree.h (type_of_this_parm, class_of_this_parm): New functions. * call.c (standard_conversion): Call class_of_this_parm. * cxx-pretty-print.c (pp_cxx_implicit_parameter_type): Likewise. (pp_cxx_direct_abstract_declarator): Likewise. * decl2.c (change_return_type): Likewise. (cp_reconstruct_complex_type): Likewise. * error.c (dump_type_suffix, dump_function_decl): Likewise. * mangle.c (write_function_type): Likewise. * pt.c (unify): Likewise. * typeck.c (merge_types, type_memfn_quals): Likewise. * decl.c (build_this_parm): Call type_of_this_parm. From-SVN: r173496 --- gcc/cp/ChangeLog | 14 ++++++++++++++ gcc/cp/call.c | 4 ++-- gcc/cp/cp-tree.h | 19 +++++++++++++++++++ gcc/cp/cxx-pretty-print.c | 5 ++--- gcc/cp/decl.c | 2 +- gcc/cp/decl2.c | 6 ++---- gcc/cp/error.c | 6 ++---- gcc/cp/mangle.c | 2 +- gcc/cp/pt.c | 4 ++-- gcc/cp/typeck.c | 4 ++-- 10 files changed, 47 insertions(+), 19 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dfaaeaa54c1..f19c0c1d1c7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,17 @@ +2011-05-06 Nathan Froyd + + * cp-tree.h (type_of_this_parm, class_of_this_parm): New functions. + * call.c (standard_conversion): Call class_of_this_parm. + * cxx-pretty-print.c (pp_cxx_implicit_parameter_type): Likewise. + (pp_cxx_direct_abstract_declarator): Likewise. + * decl2.c (change_return_type): Likewise. + (cp_reconstruct_complex_type): Likewise. + * error.c (dump_type_suffix, dump_function_decl): Likewise. + * mangle.c (write_function_type): Likewise. + * pt.c (unify): Likewise. + * typeck.c (merge_types, type_memfn_quals): Likewise. + * decl.c (build_this_parm): Call type_of_this_parm. + 2011-05-06 Dodji Seketeli PR c++/48838 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index f5bd521ddaa..3a71572b67d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -1146,8 +1146,8 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p, { tree fromfn = TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (from)); tree tofn = TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (to)); - tree fbase = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (fromfn))); - tree tbase = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (tofn))); + tree fbase = class_of_this_parm (fromfn); + tree tbase = class_of_this_parm (tofn); if (!DERIVED_FROM_P (fbase, tbase) || !same_type_p (TREE_TYPE (fromfn), TREE_TYPE (tofn)) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 9d13393502d..ad298dfd575 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4616,6 +4616,25 @@ struct GTY(()) tinst_level { bool in_system_header_p; }; +/* Return the type of the `this' parameter of FNTYPE. */ + +static inline tree +type_of_this_parm (const_tree fntype) +{ + function_args_iterator iter; + gcc_assert (TREE_CODE (fntype) == METHOD_TYPE); + function_args_iter_init (&iter, fntype); + return function_args_iter_cond (&iter); +} + +/* Return the class of the `this' parameter of FNTYPE. */ + +static inline tree +class_of_this_parm (const_tree fntype) +{ + return TREE_TYPE (type_of_this_parm (fntype)); +} + /* A parameter list indicating for a function with no parameters, e.g "int f(void)". */ extern cp_parameter_declarator *no_parameters; diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index bd0381bf438..04f8f7b2adf 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -1363,7 +1363,7 @@ pp_cxx_ptr_operator (cxx_pretty_printer *pp, tree t) static inline tree pp_cxx_implicit_parameter_type (tree mf) { - return TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (TREE_TYPE (mf)))); + return class_of_this_parm (TREE_TYPE (mf)); } /* @@ -1652,8 +1652,7 @@ pp_cxx_direct_abstract_declarator (cxx_pretty_printer *pp, tree t) if (TREE_CODE (t) == METHOD_TYPE) { pp_base (pp)->padding = pp_before; - pp_cxx_cv_qualifier_seq - (pp, TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (t)))); + pp_cxx_cv_qualifier_seq (pp, class_of_this_parm (t)); } pp_cxx_exception_specification (pp, t); break; diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3622c2ceae6..e766503b820 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6924,7 +6924,7 @@ build_this_parm (tree type, cp_cv_quals quals) tree parm; cp_cv_quals this_quals; - this_type = TREE_VALUE (TYPE_ARG_TYPES (type)); + this_type = type_of_this_parm (type); /* The `this' parameter is implicitly `const'; it cannot be assigned to. */ this_quals = (quals & TYPE_QUAL_RESTRICT) | TYPE_QUAL_CONST; diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index ef8de31b807..2e08dd730d9 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -161,8 +161,7 @@ change_return_type (tree new_ret, tree fntype) } else newtype = build_method_type_directly - (TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (fntype))), - new_ret, TREE_CHAIN (args)); + (class_of_this_parm (fntype), new_ret, TREE_CHAIN (args)); if (raises) newtype = build_exception_variant (newtype, raises); if (attrs) @@ -1249,8 +1248,7 @@ cp_reconstruct_complex_type (tree type, tree bottom) so we must compensate by getting rid of it. */ outer = build_method_type_directly - (TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (type))), - inner, + (class_of_this_parm (type), inner, TREE_CHAIN (TYPE_ARG_TYPES (type))); } else if (TREE_CODE (type) == OFFSET_TYPE) diff --git a/gcc/cp/error.c b/gcc/cp/error.c index fce74036b02..e580fd92158 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -794,8 +794,7 @@ dump_type_suffix (tree t, int flags) dump_parameters (arg, flags & ~TFF_FUNCTION_DEFAULT_ARGUMENTS); if (TREE_CODE (t) == METHOD_TYPE) - pp_cxx_cv_qualifier_seq - (cxx_pp, TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (t)))); + pp_cxx_cv_qualifier_seq (cxx_pp, class_of_this_parm (t)); else pp_cxx_cv_qualifier_seq (cxx_pp, t); dump_exception_spec (TYPE_RAISES_EXCEPTIONS (t), flags); @@ -1360,8 +1359,7 @@ dump_function_decl (tree t, int flags) if (TREE_CODE (fntype) == METHOD_TYPE) { pp_base (cxx_pp)->padding = pp_before; - pp_cxx_cv_qualifier_seq - (cxx_pp, TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (fntype)))); + pp_cxx_cv_qualifier_seq (cxx_pp, class_of_this_parm (fntype)); } if (flags & TFF_EXCEPTION_SPECIFICATION) diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 3dbc3b7782a..c72e6d2fc64 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2247,7 +2247,7 @@ write_function_type (const tree type) { /* The first parameter must be a POINTER_TYPE pointing to the `this' parameter. */ - tree this_type = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (type))); + tree this_type = class_of_this_parm (type); write_CV_qualifiers_for_type (this_type); } diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index d109e1bd739..76fc69bc0ef 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15600,8 +15600,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict) if (TREE_CODE (parm) == METHOD_TYPE && (!check_cv_quals_for_unify (UNIFY_ALLOW_NONE, - TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (arg))), - TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (parm)))))) + class_of_this_parm (arg), + class_of_this_parm (parm)))) return 1; if (unify (tparms, targs, TREE_TYPE (parm), diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index afe0dbcf2b2..4d0c0d7b06b 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -834,7 +834,7 @@ merge_types (tree t1, tree t2) { /* Get this value the long way, since TYPE_METHOD_BASETYPE is just the main variant of this. */ - tree basetype = TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (t2))); + tree basetype = class_of_this_parm (t2); tree raises = merge_exception_specifiers (TYPE_RAISES_EXCEPTIONS (t1), TYPE_RAISES_EXCEPTIONS (t2)); tree t3; @@ -8034,7 +8034,7 @@ type_memfn_quals (const_tree type) if (TREE_CODE (type) == FUNCTION_TYPE) return TYPE_QUALS (type); else if (TREE_CODE (type) == METHOD_TYPE) - return cp_type_quals (TREE_TYPE (TREE_VALUE (TYPE_ARG_TYPES (type)))); + return cp_type_quals (class_of_this_parm (type)); else gcc_unreachable (); } -- 2.30.2