From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 5BA36386E55A; Thu, 15 Dec 2022 21:48:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BA36386E55A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671140914; bh=eZOuLP3XyxmjZ1oJCDTOUuEyWvf3VawTyOkv5jQHvhg=; h=From:To:Subject:Date:From; b=s9odKgipeedJWseUSHeI2QM7Dl2+vUBbFMg1A0g/2o8dyKGXcEcH41XoKJ9L3qhhx cmPGCNtjAgMvbcN8GfG5hYXVLVZlsBoROVTsMITC+OD7n4ml9He2B6YXNhc3mbaK3X VpW2BrX9C95UOFaUZ6PhwnhfMWpBLZsKyhYXe9M0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4733] c++: rename parameter X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 52e7ff23ff5967fef52ebe31b6750a56f7103080 X-Git-Newrev: 57ab3714b6c436032ca440f9432c5837928de969 Message-Id: <20221215214834.5BA36386E55A@sourceware.org> Date: Thu, 15 Dec 2022 21:48:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:57ab3714b6c436032ca440f9432c5837928de969 commit r13-4733-g57ab3714b6c436032ca440f9432c5837928de969 Author: Jason Merrill Date: Mon Dec 12 17:25:58 2022 -0500 c++: rename parameter gcc/cp/ChangeLog: * init.cc (build_vec_init): Rename "flags" to "cleanup_flags" to distinguish from LOOKUP_*. Diff: --- gcc/cp/init.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index 428fac5621c..73e6547c076 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -4379,7 +4379,7 @@ build_vec_init (tree base, tree maxindex, tree init, bool explicit_value_init_p, int from_array, tsubst_flags_t complain, - vec** flags /* = nullptr */) + vec** cleanup_flags /* = nullptr */) { tree rval; tree base2 = NULL_TREE; @@ -4590,8 +4590,8 @@ build_vec_init (tree base, tree maxindex, tree init, anything for arrays. But if the array is a subobject, we need to tell split_nonconstant_init how to turn off this cleanup in favor of the cleanup for the complete object. */ - if (flags) - vec_safe_push (*flags, build_tree_list (iterator, maxindex)); + if (cleanup_flags) + vec_safe_push (*cleanup_flags, build_tree_list (iterator, maxindex)); } /* Should we try to create a constant initializer? */ @@ -4650,7 +4650,8 @@ build_vec_init (tree base, tree maxindex, tree init, if (digested) one_init = cp_build_init_expr (baseref, elt); else if (tree vi = get_vec_init_expr (elt)) - one_init = expand_vec_init_expr (baseref, vi, complain, flags); + one_init = expand_vec_init_expr (baseref, vi, complain, + cleanup_flags); else if (MAYBE_CLASS_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE) one_init = build_aggr_init (baseref, elt, 0, complain); else