From e249fcad3aea469b27d92ba9ef435ee79fd932d4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 16 Jun 2017 15:42:33 +0000 Subject: cp-tree.h (build_this_parm, [...]): Add FN parm. gcc/cp/ * cp-tree.h (build_this_parm, cp_build_parm_decl) build_artificial_parm): Add FN parm. * decl.c (start_cleanup_fn): Adjust. (build_this_parm): Add FN parm, pass it through. (grokfndecl): Adjust parm building. * decl2.c (cp_build_parm_decl): Add FN parm, set context. (build_artificial_parm): Add FN parm, pass through. (maybe_retrofit_in_chrg): Adjust parm building. (start_static_storage_duration_function): Likwise. * lambda.c (maybe_aadd_lambda_conv_op): Likewise. * method.c (implicitly_declare_fn): Likewise. * parser.c (inject_this_parameter): Likewise. libcc1/ * libcp1plugin.cc (plugin_build_decl): Adjust parm building. (--This line, and those below, will be ignored-- M gcc/cp/parser.c M gcc/cp/ChangeLog M gcc/cp/decl.c M gcc/cp/lambda.c M gcc/cp/cp-tree.h M gcc/cp/method.c M gcc/cp/decl2.c M libcc1/libcp1plugin.cc M libcc1/ChangeLog From-SVN: r249268 --- libcc1/ChangeLog | 4 ++++ libcc1/libcp1plugin.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'libcc1') diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog index 14344b8..1d3921b 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,7 @@ +2017-06-16 Nathan Sidwell + + * libcp1plugin.cc (plugin_build_decl): Adjust parm building. + 2017-05-26 Nathan Sidwell * libcp1plugin.cc (plugin_make_namespace_inline): Push onto linees. diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index a96ffc0..9d9221c 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -1366,7 +1366,7 @@ plugin_build_decl (cc1_plugin::connection *self, overloading. */ SET_DECL_LANGUAGE (decl, lang_cplusplus); if (TREE_CODE (sym_type) == METHOD_TYPE) - DECL_ARGUMENTS (decl) = build_this_parm (current_class_type, + DECL_ARGUMENTS (decl) = build_this_parm (decl, current_class_type, cp_type_quals (sym_type)); for (tree arg = TREE_CODE (sym_type) == METHOD_TYPE ? TREE_CHAIN (TYPE_ARG_TYPES (sym_type)) @@ -1374,7 +1374,7 @@ plugin_build_decl (cc1_plugin::connection *self, arg && arg != void_list_node; arg = TREE_CHAIN (arg)) { - tree parm = cp_build_parm_decl (NULL_TREE, TREE_VALUE (arg)); + tree parm = cp_build_parm_decl (decl, NULL_TREE, TREE_VALUE (arg)); DECL_CHAIN (parm) = DECL_ARGUMENTS (decl); DECL_ARGUMENTS (decl) = parm; } -- cgit v1.1