From patchwork Wed Apr 26 21:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 87988 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp510916vqo; Wed, 26 Apr 2023 14:17:47 -0700 (PDT) X-Google-Smtp-Source: AKy350YKqwFxIcbdBDIYh+jemI0lfHkYxCpvhYoaDq0fm/mFJsx91B6xGxQG/kVVwvN60fZnVwlx X-Received: by 2002:a17:906:5fcd:b0:878:545b:e540 with SMTP id k13-20020a1709065fcd00b00878545be540mr15430457ejv.51.1682543867758; Wed, 26 Apr 2023 14:17:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682543867; cv=none; d=google.com; s=arc-20160816; b=MVxIQNdODj6oEX3CK7cTgaLdx8F4dLpYzJ/qwj6tPalWinrvu+3zFY5jFuxGT/P/c4 qC4KHa7Cn0T5NmRJuGCVDYsO4UKsasz3le2rKxPKgTfXkTDzrxN82hZ7j6rHy4t1/sEH OLRui9bPsgcAQMt5wI9cF8RsjWBuN7xadgg7l/UVtZRDHef6v2XClTNhzcwmuxzSNf33 QSeoAD/tLD+xxiMQJWl9JXd8rFz0dv4JROlrQDUZxPNy8hwCpl5bKijUBWZytqsCgMmq RUjXgNckY0ZtxukJOSSTjcbfdWOsCFNGoIbzWtPu5OtYtA+bqVH0uA9ALD/AsM9RaEPK XRMg== 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 :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=94vAZiNrUT/bU9orKTI1bHk2Bj24ku4EEKOZbx40PfU=; b=xHiS/1kuhedmhS3udh8qNlQo5njtKNhFVPopOLIOQoqSjF1JGsOhmm8t5PYocK5cr5 5TpY31Esi7Lrw41adDf3Qs/8LWNIUjSaeAHGvbBmWSGe7+31SjgbB+MDTGYGfFwtN31M NE86qsuj/9YyZwIn/mTzjp9QhnA3XsvtA/i8eIPQeJz+zSeCt+n0jNr1C+BoUwoYqPAq Lgfetktc+5LNzVz1xC6E6dhQOHuWtnjUDtKJBe7w304jXE9P5prUO0UfxvKeiOOpeAD7 DN7Ce7QFKcp7G6LgWR8A0wBn3NRCkqZDhgez0fidtz5me1qDxFobvv89asadgrCK54Ks EQmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=hhRQHfZV; 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 tx24-20020a1709078e9800b00959bbabcea5si5445672ejc.702.2023.04.26.14.17.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 14:17:47 -0700 (PDT) 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=hhRQHfZV; 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 B8B653854146 for ; Wed, 26 Apr 2023 21:17:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B8B653854146 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682543824; bh=94vAZiNrUT/bU9orKTI1bHk2Bj24ku4EEKOZbx40PfU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hhRQHfZVc7OwG5U0WsG6yfEIXppnLh1TUBUrFu9OJmG8re+JYT3fGbxqPuni62EIy uRb4bpgDnwcO7Xp7yeXWATqItD8iHMw6LnmLZ3W+EAhBl+w7fECAmxaKMRuEH1cKhO XyU14KtwAYrqVOjCq0bnL15ZRacdwbsPIjH8vEG8= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id BB2083858401 for ; Wed, 26 Apr 2023 21:16:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB2083858401 Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-414-JxV1jh4dPB-Ca1KgDC7aCg-1; Wed, 26 Apr 2023 17:16:17 -0400 X-MC-Unique: JxV1jh4dPB-Ca1KgDC7aCg-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-5ef40d2af43so47627286d6.3 for ; Wed, 26 Apr 2023 14:16:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682543776; x=1685135776; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=94vAZiNrUT/bU9orKTI1bHk2Bj24ku4EEKOZbx40PfU=; b=YmIPEbfgjsxWUKjNNbSzi5Mv4qo738bsR/wVysLHmmX6RHVrWIZl3iTXzDfKwHsML6 yGYFSDsw4tw70oiuyKMmcc/gjLIz+8WJ2FVoWAGZLjwX1vnjWUJpWBWnkx1pMv+R08N7 XB7nM4ew8v2VYMiuKCEz4qZza+45Qh+GwrRepzexL7RutCZOEWg3n7hC7KvitsgEU5Zx FkvhFpkU3SQhDi7lHUjq2SBXtfW6QFTZE6RXdf28ysjDwNhsNciy5K9KLqyP2SYaUBt8 6AQVpDyQUhxVHXK2wOq9MvUc/Ah7Pl42UbKkHk/Rtij1wqSGN/5tYhpPVKFBrS+9OFHE RH9w== X-Gm-Message-State: AAQBX9exYTe7v2xRF0osYd/vFKeJutL0lSvMNr93VFw8spVprZU3w8Ht vNDj4zDm/eNufpPfT8H1UTHWwjgUiY8DohyGplf/Cx46PysB+rDQ1wLXdTcmXzMF08j427PXdrR mgYbnO3PaLfqF8EcXrHg3+IAFuK9XpoQ7aiyuZKhsue0YY2AGiFEgeG7tbDHSQBB14Hf6uw9+rA == X-Received: by 2002:a05:6214:e4e:b0:5ef:4ecb:cf9d with SMTP id o14-20020a0562140e4e00b005ef4ecbcf9dmr40297564qvc.6.1682543776404; Wed, 26 Apr 2023 14:16:16 -0700 (PDT) X-Received: by 2002:a05:6214:e4e:b0:5ef:4ecb:cf9d with SMTP id o14-20020a0562140e4e00b005ef4ecbcf9dmr40297536qvc.6.1682543776044; Wed, 26 Apr 2023 14:16:16 -0700 (PDT) Received: from jason.com (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id y19-20020a0ca913000000b005dd8b9345c7sm5157934qva.95.2023.04.26.14.16.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 14:16:15 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: remove nsdmi_inst hashtable Date: Wed, 26 Apr 2023 17:16:13 -0400 Message-Id: <20230426211613.463855-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.9 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill 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?1764275118573734821?= X-GMAIL-MSGID: =?utf-8?q?1764275118573734821?= Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- It occurred to me that we have a perfectly good DECL_INITIAL field to put the instantiated DMI into, we don't need a separate hash table. gcc/cp/ChangeLog: * init.cc (nsdmi_inst): Remove. (maybe_instantiate_nsdmi_init): Use DECL_INITIAL instead. --- gcc/cp/init.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) base-commit: 50d866038a910ceb9075b97295a12d77a8d09a3a prerequisite-patch-id: 4ed1b4e9cbee2ce090bd119cbf47056c35aaeb57 prerequisite-patch-id: cd3a881f1b6cd3bca0064002d9a96f2f52c85a79 prerequisite-patch-id: b42a3670c7e30ee21934698ade2156884b63c19f diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index 9571d18170e..1dd24e30d7c 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -564,21 +564,19 @@ perform_target_ctor (tree init) /* Instantiate the default member initializer of MEMBER, if needed. Only get_nsdmi should use the return value of this function. */ -static GTY((cache)) decl_tree_cache_map *nsdmi_inst; - tree maybe_instantiate_nsdmi_init (tree member, tsubst_flags_t complain) { tree init = DECL_INITIAL (member); - if (init && DECL_LANG_SPECIFIC (member) && DECL_TEMPLATE_INFO (member)) + + /* tsubst_decl uses void_node to indicate an uninstantiated DMI. */ + if (init == void_node) { init = DECL_INITIAL (DECL_TI_TEMPLATE (member)); location_t expr_loc = cp_expr_loc_or_loc (init, DECL_SOURCE_LOCATION (member)); if (TREE_CODE (init) == DEFERRED_PARSE) /* Unparsed. */; - else if (tree *slot = hash_map_safe_get (nsdmi_inst, member)) - init = *slot; /* Check recursive instantiation. */ else if (DECL_INSTANTIATING_NSDMI_P (member)) { @@ -639,7 +637,7 @@ maybe_instantiate_nsdmi_init (tree member, tsubst_flags_t complain) DECL_INSTANTIATING_NSDMI_P (member) = 0; if (init != error_mark_node) - hash_map_safe_put (nsdmi_inst, member, init); + DECL_INITIAL (member) = init; current_function_decl = cfd; current_binding_level = cbl;