From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 393053858D28; Fri, 29 Apr 2022 19:12:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 393053858D28 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-52] c++: tidy auto deduction X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: fd0d3e9121c5aa65150d242676be6bbdc8d4a92a X-Git-Newrev: 8189838d823ea65e560c573d38a65edc12f5c2e3 Message-Id: <20220429191216.393053858D28@sourceware.org> Date: Fri, 29 Apr 2022 19:12:16 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2022 19:12:16 -0000 https://gcc.gnu.org/g:8189838d823ea65e560c573d38a65edc12f5c2e3 commit r13-52-g8189838d823ea65e560c573d38a65edc12f5c2e3 Author: Jason Merrill Date: Fri Apr 29 14:21:47 2022 -0400 c++: tidy auto deduction In r185768 I added the !FUNCTION_DECL check, but we might as well just check for variable; nothing else should take this path, and asserting as much doesn't regress anything. gcc/cp/ChangeLog: * decl.cc (cp_finish_decl): Only consider auto for vars. Diff: --- gcc/cp/decl.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 45206c236c1..16565bf0a0e 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8077,7 +8077,7 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, && (DECL_INITIAL (decl) || init)) DECL_INITIALIZED_IN_CLASS_P (decl) = 1; - if (TREE_CODE (decl) != FUNCTION_DECL + if (VAR_P (decl) && (auto_node = type_uses_auto (type))) { tree d_init; @@ -8105,11 +8105,10 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, d_init = resolve_nondeduced_context (d_init, tf_warning_or_error); } enum auto_deduction_context adc = adc_variable_type; - if (VAR_P (decl) && DECL_DECOMPOSITION_P (decl)) + if (DECL_DECOMPOSITION_P (decl)) adc = adc_decomp_type; tree outer_targs = NULL_TREE; if (PLACEHOLDER_TYPE_CONSTRAINTS_INFO (auto_node) - && VAR_P (decl) && DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl) && !DECL_FUNCTION_SCOPE_P (decl))