From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682543778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=94vAZiNrUT/bU9orKTI1bHk2Bj24ku4EEKOZbx40PfU=; b=Kc6zDhr0XYq2PAsOpw61UMw1UJT9UEcNR/I0qmA1qY39be7CxwPj9Si5OZTeMD/J4DrZsY ZY3bo+1J3ykgdqherz4iVep5NLSm6y6ByB1FzypZ4R8XwWyClPyUaZRINWAWiGIL+rIeZI vqCjOSa7OhxbmWjqHU92Jr3GYRPITEc= 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-Google-Smtp-Source: AKy350YbhrR7eI3NQSuSQa6nc+GqEVVjN+E5Q3F1QSNMkKTr2iHiJ5xe2SZIC4wY7SJQ3bI8iYZIOQ== 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) From: Jason Merrill 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 List-Id: 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(-) 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; base-commit: 50d866038a910ceb9075b97295a12d77a8d09a3a prerequisite-patch-id: 4ed1b4e9cbee2ce090bd119cbf47056c35aaeb57 prerequisite-patch-id: cd3a881f1b6cd3bca0064002d9a96f2f52c85a79 prerequisite-patch-id: b42a3670c7e30ee21934698ade2156884b63c19f -- 2.31.1