From patchwork Tue Dec 27 04:21:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 36766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1219358wrt; Mon, 26 Dec 2022 20:22:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXvaiBg4NbNTy69EEho8+jcGdISEpCCt2XomWJX3MA3yeb3xhFmS1HZ8uZA3IHAoaTOFMhYy X-Received: by 2002:a17:906:5e04:b0:7c0:e803:4ebb with SMTP id n4-20020a1709065e0400b007c0e8034ebbmr16798961eju.70.1672114962687; Mon, 26 Dec 2022 20:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672114962; cv=none; d=google.com; s=arc-20160816; b=BxLfO5TdH9Gu9YOo7QAfq2TeiWqw1gINeYmdo9AOPcA4meRGoP3/O7WTT5XvRL47Z8 r4W99HX/Ii3m1vUWy2eWkZHM6yKFeOL6c1qhAjJhFPK1r932qp8t0cFLuTkhmgJ//dkY F2H5Ggvv5LrQ9S3n7hDbfh0e0FU+BNGxh1xKwtVbvHFefd98Z/IQvf3yr2gIvXTIZi2o iY/RveE0RtlixjIiS0OhLbXJOWIipA7STft1X4mq2+DHBAbR/w4HEFnCMkyud9aDguZy OLCRvLTUFwWlndZu4A/lYncVLlLC8lgi3fRgAcph9nTwfiJUSfM1VsTiJFHmVM5xAjHN nyHA== 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=Yqz7XHYk96kgrRslQ3Yex/UqpsmoYrYKDvsEqHaiLSs=; b=OHQKZGkYmc3EjbJQ8c+1ZLJJqGXaUcUExA6S56SND1bXRag8/zYTL35bSPTGJg9bcx sbCPve99zTprCiAuZ3rAMSfbkvZKpSGrhbg9EgKkaivIYNRt9/fA0VBfQmeJxTiWwK8s b7lulvQLRNRxRWVMj/qYgzjwF4q5GM9CduNPJWzrENfKbkA+plDmC9TQvUxks4+Ypjov UEO1Iwo1jrTE1B4jCOrciijr0iPPHxIQVeXuZq2aBdb104psqK2vhMUXeBfxXsiNJyMP OXx2YVNvYz51TiNfS+8+WLdgAQe4cupLou2v0lJ9Tp62bYqCyiYhBMe2ocHYRE9Kn1oq LdGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="MDqX/VKC"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o22-20020a170906975600b007ae8d01144dsi11016298ejy.717.2022.12.26.20.22.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 20:22:42 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="MDqX/VKC"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 7C15F3858418 for ; Tue, 27 Dec 2022 04:22:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C15F3858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1672114961; bh=Yqz7XHYk96kgrRslQ3Yex/UqpsmoYrYKDvsEqHaiLSs=; 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=MDqX/VKCs6B1GSGaJgXjmr0fRw9iA/ef/ooAeLb5ltsVQqidO5NoN31J45soNFJ+F 1WXJpvijmnrG69j5r9i/KXv9G5p86y073zfk82Cqvinw+un7DWqgxQClarL/E0SIuF PqvC1kFKOXoNSCZJbFeR2O4OLjJ0yvGe/mrdltPQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id E83CA3858D32 for ; Tue, 27 Dec 2022 04:21:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E83CA3858D32 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id BD1EE1162A6; Mon, 26 Dec 2022 23:21:58 -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 ZI-WUsrdkY8U; Mon, 26 Dec 2022 23:21:58 -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 5E83411628F; Mon, 26 Dec 2022 23:21:58 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 2BR4Lo0W712080 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Dec 2022 01:21:50 -0300 To: gcc-patches@gcc.gnu.org Cc: Jason Merrill , Nathan Sidwell Subject: [04/13] [C++] constraint: insert norm entry once Organization: Free thinker, does not speak for AdaCore References: Date: Tue, 27 Dec 2022 01:21:50 -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?1753339619164195095?= X-GMAIL-MSGID: =?utf-8?q?1753339619164195095?= Use NO_INSERT to test whether inserting should be attempted. Regstrapped on x86_64-linux-gnu. Ok to install? for gcc/cp/ChangeLog * constraint.cc (normalize_concept_check): Use NO_INSERT for pre-insertion check. --- gcc/cp/constraint.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index 37eae03afdb73..f28f96ada463e 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -777,14 +777,16 @@ normalize_concept_check (tree check, tree args, norm_info info) norm_entry entry = {tmpl, targs, NULL_TREE}; norm_entry **slot = nullptr; hashval_t hash = 0; + bool insert = false; if (!info.generate_diagnostics ()) { /* Cache the normal form of the substituted concept-id (when not diagnosing). */ hash = norm_hasher::hash (&entry); - slot = norm_cache->find_slot_with_hash (&entry, hash, INSERT); - if (*slot) + slot = norm_cache->find_slot_with_hash (&entry, hash, NO_INSERT); + if (slot) return (*slot)->norm; + insert = true; } /* The concept may have been ill-formed. */ @@ -794,7 +796,7 @@ normalize_concept_check (tree check, tree args, norm_info info) info.update_context (check, args); tree norm = normalize_expression (def, targs, info); - if (slot) + if (insert) { /* Recompute SLOT since norm_cache may have been expanded during the recursive call. */