From patchwork Wed Oct 2 11:50:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1991986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=BWFC7cNG; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YS3+iBbV; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=BWFC7cNG; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=YS3+iBbV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJY691NB3z1xtn for ; Wed, 2 Oct 2024 21:50:41 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DE0B386544E for ; Wed, 2 Oct 2024 11:50:39 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 5BF39384F032 for ; Wed, 2 Oct 2024 11:50:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5BF39384F032 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5BF39384F032 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727869817; cv=none; b=vQjYMEhbxqpxc6jF63vOKAPZb/Oc7iT9//s9wOHt1+Zxns1bpKCAYRCt+2es81FUWE8UPEryvplsY1yFG7bSXIz4//6L0w7Xn7HNmShc1k7VbnKFk6NdMId5LU2ugKfnU4VXaI7QeuB+Qf/zHNev9XPeXzo9RNKMZa42+AvRPQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727869817; c=relaxed/simple; bh=c1iyvjzuMtCVmGAc7zJu112AVPnapQCns/NkP8PvudA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=gtGXzcsS8tX1G0ueA7K5730SLLgGVrdz6blaZ+0QN5aNmB907ZrLzzbdM4sJUX/iSGukp3Q2AO5WVqd9fdcS/DpNMoeZULbU5J7cZY8TfZ5hsQECUrSpJM/qzMqQWEbWkQu7vMhRdCy3w5ix9N1mLd0+iUxKwAbaXFntk4BHLFY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from murzim.nue2.suse.org (unknown [10.168.4.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 63A891FD54; Wed, 2 Oct 2024 11:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1727869814; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=bEbw8k5PgwNFZSM00spqgZ+uBDx4A73myE5FGn7/rK8=; b=BWFC7cNG1hvMDrzIruX/sjN8PJQ04ZKXGGlGbij1lkzMS4y3B7xXsr372TQWXLtYE8chLa XIfXxzrFf1FEJGNRmszBrUdAdWRSj0laXjd1kr3SAsjEMZu2n7WWFWZ6lQYTF4Ix7ehhdQ +yHWbvSRHrsK3iy7i4a5426WNIODIj4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1727869814; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=bEbw8k5PgwNFZSM00spqgZ+uBDx4A73myE5FGn7/rK8=; b=YS3+iBbVg6Nd75ZO9jUq3Crv40tAPh5Ggd4ubxHRQh7yuG3qWU7tEzXzPoUI4HFv26+arH pqGoSbgERCmrscBw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1727869814; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=bEbw8k5PgwNFZSM00spqgZ+uBDx4A73myE5FGn7/rK8=; b=BWFC7cNG1hvMDrzIruX/sjN8PJQ04ZKXGGlGbij1lkzMS4y3B7xXsr372TQWXLtYE8chLa XIfXxzrFf1FEJGNRmszBrUdAdWRSj0laXjd1kr3SAsjEMZu2n7WWFWZ6lQYTF4Ix7ehhdQ +yHWbvSRHrsK3iy7i4a5426WNIODIj4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1727869814; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=bEbw8k5PgwNFZSM00spqgZ+uBDx4A73myE5FGn7/rK8=; b=YS3+iBbVg6Nd75ZO9jUq3Crv40tAPh5Ggd4ubxHRQh7yuG3qWU7tEzXzPoUI4HFv26+arH pqGoSbgERCmrscBw== Date: Wed, 2 Oct 2024 13:50:14 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: jason@redhat.com Subject: [PATCH 2/3] Release expanded template argument vector MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-1.52 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MISSING_MID(2.50)[]; NEURAL_HAM_LONG(-0.72)[-0.721]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; MIME_TRACE(0.00)[0:+] X-Spam-Score: -1.52 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20241002115039.4DE0B386544E@sourceware.org> This reduces peak memory usage by 20% for a specific testcase. Bootstrapped and tested on x86_64-unknown-linux-gnu. It's very ugly so I'd appreciate suggestions on how to handle such situations better? gcc/cp/ * pt.cc (coerce_template_parms): Release expanded argument vector when not needed. --- gcc/cp/pt.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 04f0a1d5fff..2c8b0d8609d 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -9442,6 +9442,9 @@ coerce_template_parms (tree parms, SET_NON_DEFAULT_TEMPLATE_ARGS_COUNT (new_inner_args, TREE_VEC_LENGTH (new_inner_args)); + if ((return_full_args ? new_args != inner_args : new_inner_args != inner_args) + && inner_args != orig_inner_args) + ggc_free (inner_args); return return_full_args ? new_args : new_inner_args; }