From patchwork Tue Dec 27 04:30:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 36771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1221058wrt; Mon, 26 Dec 2022 20:31:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXut+RUEgfuXUmDrvGUGso9d4+7beO3wHJyNySje9RUJ0z+fmggTRcQLDeM4exfMc5ALXDya X-Received: by 2002:a05:6402:cb4:b0:483:6d73:ad02 with SMTP id cn20-20020a0564020cb400b004836d73ad02mr11245639edb.35.1672115462645; Mon, 26 Dec 2022 20:31:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672115462; cv=none; d=google.com; s=arc-20160816; b=xQybu9U6RIFDENfEaJdrEmUjttIDXjfvGtCXlADwXtm7iWVRa3uI8F5li7/FCCGY1V FjfnTDZm1zsBjJFY7xi13yAo2Y7fhbsf0v5cgEOq5aEbD1vPGvbifQl6PjGcupNNUW4x OBHOjZFGSVGRAtGq8mqOlPgfHHlNENsq+P1Tf/tJ2hbYhM7eRaikWuQa0S2cwjSoOYlY 3fXykMceUfihnh+3fPLhlsCAZ5ZXm2vtfwZ13frG1MJw5FEThjJzeejlPno6PmPFed2Q pfOP9Xun6TZ71ZCCPcSwypkNCkelGvXvOB7gxipNLrbMPlyADM4M6nZadUhtBzDK41Wp 6xYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:message-id:in-reply-to:date:references:organization :subject:cc:to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=3TwQNnw9AuDlFblj0lK4GThcGK41glUKVXhzbrpRfkI=; b=OtRGAHx6WPYkgdpHQEuttYkQfF47m0GWoXy8kHqK4WLhGb/v/VqxjtA0N/Iz5hzKLF Nj1tnQ6A4ujAzDhCAAwBcbI0+9CbbULghEhhjn/CK64xxULihy/7jg+KkRDWbxA7IkaN p/w4WSJpqpvfeuSaS/S152mx+evsKQBwM4gQUfs+14mK2grwpga13sW1uSXuRxheMzY3 OarbkmqQ2CINoEsn9V46utrGcsAUpvKWmmHSfTfrLr2LKaqtVOV3s6ltNR4kPIruk4i4 /CnumPJPUKBSMfKMPWYfNRmOIMXPiQGm/SgVzaof2CdEcTpvda7UKSdiCjuk+B80+R4e 18KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=s48MBo7W; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b10-20020a056402084a00b0047df36b44f5si11211841edz.582.2022.12.26.20.31.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 20:31:02 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=s48MBo7W; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A24333858C2D for ; Tue, 27 Dec 2022 04:31:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A24333858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1672115461; bh=3TwQNnw9AuDlFblj0lK4GThcGK41glUKVXhzbrpRfkI=; h=To:Cc:Subject:References:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=s48MBo7WL0u4g1wWVNYY0aw7Nca5IEOhZs/u9lE5EJaGnvfWZ8W6rxsoBsZ7DRP9X mi57Ju2q26d/yNUbM3cO87zsf0vSokKSvedd0nFNs3iqdqMUJT/odWM+IMYotuvX6s z/aO+v86BAYOX7ehCtFy5F5PQXwUIPRVousll5VQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTPS id AA2693858D3C for ; Tue, 27 Dec 2022 04:30:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AA2693858D3C Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 7DC3D1162A6; Mon, 26 Dec 2022 23:30:09 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id x8Tbz2gYLg1O; Mon, 26 Dec 2022 23:30:09 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 1CFB811628F; Mon, 26 Dec 2022 23:30:08 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 2BR4U0lW712370 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Dec 2022 01:30:00 -0300 To: gcc-patches@gcc.gnu.org Cc: Jason Merrill , Nathan Sidwell Subject: [09/13] [C++] constexpr: request insert iff depth is ok Organization: Free thinker, does not speak for AdaCore References: Date: Tue, 27 Dec 2022 01:30:00 -0300 In-Reply-To: (Alexandre Oliva's message of "Tue, 27 Dec 2022 01:07:35 -0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753340142938792238?= X-GMAIL-MSGID: =?utf-8?q?1753340142938792238?= cxx_eval_call_expression requests an INSERT even in cases when it would later decide not to insert. This could break double-hashing chains. Arrange for it to use NO_INSERT when the insertion would not be completed. Regstrapped on x86_64-linux-gnu. Ok to install? for gcc/cp/ChangeLog * constexpr.cc (cxx_eval_call_expression): Do not request an INSERT that would not be completed. --- gcc/cp/constexpr.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index d99c49bdbe282..6d20ffa2cdeb6 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -3000,13 +3000,15 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, /* If we have seen this call before, we are done. */ maybe_initialize_constexpr_call_table (); + bool insert = depth_ok < constexpr_cache_depth; constexpr_call **slot - = constexpr_call_table->find_slot (&new_call, INSERT); - entry = *slot; + = constexpr_call_table->find_slot (&new_call, + insert ? INSERT : NO_INSERT); + entry = slot ? *slot : NULL; if (entry == NULL) { /* Only cache up to constexpr_cache_depth to limit memory use. */ - if (depth_ok < constexpr_cache_depth) + if (insert) { /* We need to keep a pointer to the entry, not just the slot, as the slot can move during evaluation of the body. */