+ * 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.
+