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 219CA3858C74 for ; Fri, 1 Mar 2024 13:12:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 219CA3858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 219CA3858C74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709298753; cv=none; b=b+u4i+mXERgc/UrSKrHYKnlv5NcgK7zAIa9I92G03qJ6YsFA3RMVtTvJQYhAk2kXs+WMwqDdsY5EKMpooLNUDIzv4UEbLMCwmP0w6gwuSozqjfqY51mzGwk4EU0DTo0JdgS1DMU3gOUprj4klOOgOvjYwu0AbEjpAsLp41HtHkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709298753; c=relaxed/simple; bh=zUwyI+eiT33qGZvJ2oSL0mCtNed8JkqaPMZPagnjx48=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=UQPdnKYHyD9Z53HoKEjRSiGL1Qdpls4eHrWijT/rxQ4JKLd+FZHJd3U1f9l6cuk5V8xzkPfS4vnO1flGspnwqDD21q9pFgInNpRwQ5l0bz/eEgjRSD37IK83YbUSFW9QRlqW3Tgyu40+EfqcWS5kAawFRHPqz2VzViZujnVYeyM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709298751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NtsBDKkSyodea+L6QNpAkoooPL7hOphLnVWSyZQplRk=; b=RmzuDGBGlC6zw5rhjBgjGJ74ydMQc1exDSoWtGOnWLTKO3/FbLKSOKRrXqPChAX/wqV7t7 MrqNS2vMrms1RRLf4v/CwigLD2ya/218ariIbxl/3R/szJ/pMj4A5vyEj/d9SCJu5CablZ SV5CJ7EVO6JfuDzhVvwJphPexlZVoTE= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578--mUG6xPzPfuwRrcmpmMUyQ-1; Fri, 01 Mar 2024 08:12:30 -0500 X-MC-Unique: -mUG6xPzPfuwRrcmpmMUyQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-68f8b4cc3f1so16183526d6.2 for ; Fri, 01 Mar 2024 05:12:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709298749; x=1709903549; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NtsBDKkSyodea+L6QNpAkoooPL7hOphLnVWSyZQplRk=; b=tTQcCam23vYylr5cBXt+ZwzG49W1gh8x78wY0ee8L4235eLkBHJALeRLFOJzPafxY0 78EJ/1KfYgfGRvrHUW4XxYFdF78/I7+/1B9eVGFarrlX7WM5YrWdKS2jLoQG5SYZVhPZ Ph3xOMjABmzE504C3KMQO/qK9HY3nSTY6xbJSj0BoxmllZI+iPhGCfWj1HKtxs4nOWVT vd3CbjBR0Wixjtupivbq3pQGZy3LTa3uSWpJ6XljtBVHbRAKDqUdLl1oVg5vwhtbMBqL c4oPbMjCmGdeQgMEcbw6zwldcKpcT3BtZsqFHST+NrJgpkSl7PYekeNFiyvsIaa7xtHg 1MNg== X-Forwarded-Encrypted: i=1; AJvYcCUdJuebJsNsX5CfyflKalwB1C5NeIs2HoebisjgadLD9RodB3qKDz2XbQzOq1op09jc4wabEeINFki3bQyQKybN23HtIMtq+A== X-Gm-Message-State: AOJu0YwWNLwpgHyPuJcEMz7v4AiNWG3GAKZ+rhJXLzbkH4pokzRUGWb2 ZXcyvw3cFkQQHn6q1VnmkSbX5hQ7+qqf2lu174IY/2IVpUwrXb+EQWg3YIIA4JLl/RL+UG/Prr2 oEAi1XJy6yEKka9KBiTygKgteKyvqrOUt1Tl+QjCgs0xYzqTn0TzIdJk= X-Received: by 2002:a0c:efc1:0:b0:68f:22b1:8e24 with SMTP id a1-20020a0cefc1000000b0068f22b18e24mr1791096qvt.28.1709298749751; Fri, 01 Mar 2024 05:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkmpoMrWgFxnIA1jYIi1okE2YA1PjhXhEo/L43GUKJ7HkRwdlW81KSHJK1MxmGm9hrQe2bWg== X-Received: by 2002:a0c:efc1:0:b0:68f:22b1:8e24 with SMTP id a1-20020a0cefc1000000b0068f22b18e24mr1791074qvt.28.1709298749445; Fri, 01 Mar 2024 05:12:29 -0800 (PST) Received: from [192.168.1.130] (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 lx6-20020a0562145f0600b0068f752195b5sm1849136qvb.86.2024.03.01.05.12.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Mar 2024 05:12:28 -0800 (PST) Message-ID: <25f79249-6c7c-427b-986f-10a4a2aee35f@redhat.com> Date: Fri, 1 Mar 2024 08:12:28 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: Ensure DECL_CONTEXT is set for temporary vars [PR114005] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Nathan Sidwell References: <65e0f6e4.a70a0220.12e52.86bd@mx.google.com> From: Jason Merrill In-Reply-To: <65e0f6e4.a70a0220.12e52.86bd@mx.google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.6 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_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,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: On 2/29/24 16:28, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? > > Alternatively we could update 'DECL_CONTEXT' only for > 'make_temporary_var_for_ref_to_temp' in call.cc, as a more targetted > fix, but I felt that this way it'd also fix any other similar issues > that have gone uncaught so far. > > -- >8 -- > > Modules streaming requires DECL_CONTEXT to be set for anything streamed. > This patch ensures that 'create_temporary_var' does set a DECL_CONTEXT > for these variables (such as the backing storage for initializer_lists) > even if not inside a function declaration. > > PR c++/114005 > > gcc/cp/ChangeLog: > > * init.cc (create_temporary_var): Set DECL_CONTEXT to > current_namespace if at namespace scope. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/pr114005_a.C: New test. > * g++.dg/modules/pr114005_b.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/init.cc | 2 ++ > gcc/testsuite/g++.dg/modules/pr114005_a.C | 8 ++++++++ > gcc/testsuite/g++.dg/modules/pr114005_b.C | 7 +++++++ > 3 files changed, 17 insertions(+) > create mode 100644 gcc/testsuite/g++.dg/modules/pr114005_a.C > create mode 100644 gcc/testsuite/g++.dg/modules/pr114005_b.C > > diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc > index ac37330527e..e6fca7b3226 100644 > --- a/gcc/cp/init.cc > +++ b/gcc/cp/init.cc > @@ -4258,6 +4258,8 @@ create_temporary_var (tree type) > DECL_ARTIFICIAL (decl) = 1; > DECL_IGNORED_P (decl) = 1; > DECL_CONTEXT (decl) = current_function_decl; > + if (!DECL_CONTEXT (decl)) > + DECL_CONTEXT (decl) = current_namespace; Maybe always set it to current_scope () instead of current_function_decl? OK with that change. Jason