From patchwork Tue Nov 9 16:02:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 47292 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EAA923858423 for ; Tue, 9 Nov 2021 16:02:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAA923858423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636473778; bh=h5yJcTVV1N6pKq+G0O7ym+9B0fqc0rV2+qPFYwYbb7U=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PN1cwoFMpDLqQPKfjfNUuSzdwW7oQ5E6wVqHDCqEUA1ZddmbMabxITq6Et7dFF1+x esjHvJE6KtiI4AcXiy7G52AkjwdBpFytGpNa8nFCLZVg0sAKvxYCsMFfuZOBxdUD57 ghaBFTQuiEf4QmutyQmnrK1sTFPBb/ELp6ezL400= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D3BEC3858C3A for ; Tue, 9 Nov 2021 16:02:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D3BEC3858C3A Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-5jifLaacNYimzkSI6Jwz7g-1; Tue, 09 Nov 2021 11:02:27 -0500 X-MC-Unique: 5jifLaacNYimzkSI6Jwz7g-1 Received: by mail-qt1-f199.google.com with SMTP id v17-20020a05622a131100b002aea167e24aso1331605qtk.5 for ; Tue, 09 Nov 2021 08:02:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h5yJcTVV1N6pKq+G0O7ym+9B0fqc0rV2+qPFYwYbb7U=; b=va068yVmUUoilSayj2+rrYWmXtfA7sqQZT/VQcdfQesZqnf/zbY2ecvLqIdVuSQqYi /DI4Pflq4lrRIpSz5yoo351nHFhP1kZQshIAWqsUM4m+Bh4RNTFjIKDf29DhdiF073Nr G/T29h0+SDdxrPJEE8sq9mJIBX3N+XANG0ZS4bFb27WVvi0MSvrU7nIHSd7RO1Loux3C qC+1GndFPMRWZ6B4tVWCzx/Q0IDf7yES3qEtNob/eJBB5Ld1bJUjmhIhl8FzzcjgzPT5 9lamTm0tKg+gsFjz3UNk7J5i+2NXV12rxlWpVf31WhG3Z5flRShaax5twMMr9skLOAas w05g== X-Gm-Message-State: AOAM533r/7skUwZo9S5MzcxqwmuRi7mE4vUQokhtlumETnSvJtDJ/XDj 3okuO20nTnrXiuzuG/j0zHMxub2JawifWZF6tEs8ycdLb4xFtQKtJoRi+g4KfmkOlNFOmSZBaSL JLTWCHEiQqR2u60gg0zunpAzqmDkOr05DNw7ln8pBINvY8y2gIyFjw8d/17Y/Y/em08w= X-Received: by 2002:a0c:c984:: with SMTP id b4mr628421qvk.45.1636473746488; Tue, 09 Nov 2021 08:02:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEDU+5OKgeAD4/1W5hPRoB5BS7X25YPxsvDcEk3s0ojIYeV+2Lp/MqNpw6XKbGZdYzxGtCJQ== X-Received: by 2002:a0c:c984:: with SMTP id b4mr628379qvk.45.1636473746188; Tue, 09 Nov 2021 08:02:26 -0800 (PST) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id bp40sm12056947qkb.114.2021.11.09.08.02.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 08:02:25 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: use auto_vec in cp_parser_template_argument_list Date: Tue, 9 Nov 2021 11:02:22 -0500 Message-Id: <20211109160222.3758174-1-ppalka@redhat.com> X-Mailer: git-send-email 2.34.0.rc1.14.g88d915a634 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-16.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? gcc/cp/ChangeLog: * parser.c (cp_parser_template_argument_list): Use auto_vec instead of manual memory management. --- gcc/cp/parser.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 32de97b08bd..8823399529e 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18558,11 +18558,6 @@ cp_parser_template_name (cp_parser* parser, static tree cp_parser_template_argument_list (cp_parser* parser) { - tree fixed_args[10]; - unsigned n_args = 0; - unsigned alloced = 10; - tree *arg_ary = fixed_args; - tree vec; bool saved_in_template_argument_list_p; bool saved_ice_p; bool saved_non_ice_p; @@ -18581,16 +18576,15 @@ cp_parser_template_argument_list (cp_parser* parser) parser->non_integral_constant_expression_p = false; /* Parse the arguments. */ + auto_vec args; do { - tree argument; - - if (n_args) + if (!args.is_empty ()) /* Consume the comma. */ cp_lexer_consume_token (parser->lexer); /* Parse the template-argument. */ - argument = cp_parser_template_argument (parser); + tree argument = cp_parser_template_argument (parser); /* If the next token is an ellipsis, we're expanding a template argument pack. */ @@ -18610,29 +18604,16 @@ cp_parser_template_argument_list (cp_parser* parser) argument = make_pack_expansion (argument); } - if (n_args == alloced) - { - alloced *= 2; - - if (arg_ary == fixed_args) - { - arg_ary = XNEWVEC (tree, alloced); - memcpy (arg_ary, fixed_args, sizeof (tree) * n_args); - } - else - arg_ary = XRESIZEVEC (tree, arg_ary, alloced); - } - arg_ary[n_args++] = argument; + args.safe_push (argument); } while (cp_lexer_next_token_is (parser->lexer, CPP_COMMA)); - vec = make_tree_vec (n_args); + int n_args = args.length (); + tree vec = make_tree_vec (n_args); - while (n_args--) - TREE_VEC_ELT (vec, n_args) = arg_ary[n_args]; + for (int i = 0; i < n_args; i++) + TREE_VEC_ELT (vec, i) = args[i]; - if (arg_ary != fixed_args) - free (arg_ary); parser->non_integral_constant_expression_p = saved_non_ice_p; parser->integral_constant_expression_p = saved_ice_p; parser->in_template_argument_list_p = saved_in_template_argument_list_p;