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.129.124]) by sourceware.org (Postfix) with ESMTPS id 286B03858D28 for ; Wed, 24 Jan 2024 20:06:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 286B03858D28 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 286B03858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706126769; cv=none; b=rOB0+42ukTMldP4LX8BuzUHuwEt9E2kzsRNWYEe+UZ9E7zDxqAiZ5VOuRYfhzFbzqeRvjYhjdKNJVdBsYbvkRCNFFQlezEv2HTC+iBdrQ4j5UaXPP19/Q+6KklI2AjQRFwxJWC4g+TFjpRyUtk+zhLqhNtj4wnIkoEu8bC+rB5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706126769; c=relaxed/simple; bh=JwFz4PcyMFbz8YwixtDfyeZWHpaEc3QWnaJfMYazsAQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=TWF7U4eznEkogNXVa99qyMP3pcG5Soz7kwLWaguxGSHjij11mP4Faqz9plEnIx2IupM0U93qcthJ/qKq2a2x50sCf4IxHyk6lwMp+LHENruH12QtyHBVrdG+DuiG0gl6ym5D+WOY40XkWi8D2KuiIf96DlSOlWqP0u9eE2Wls4Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706126765; 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=5dIcr7TW+paqaSs/ZY312IdEV7gZIifDJHUsthomAf8=; b=Ly4k5p1982mxIxzmQmvABt9pICUCsEg/Mh9Q5r1yU/o8ephcc+u7hRUFvTn2JIKCH0ELoi 9UVg/jz2WrLNElJtgBQ3TBY0/5lSDXAhaxZRwv2de03SXsKI5EBGs2xQ4pqujfns+nBlAI pmn2P6x7wv7YvMmSqmepi4DPxe6nQxI= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-443-XLIsRPsHMpmLsJCec5o2qA-1; Wed, 24 Jan 2024 15:06:03 -0500 X-MC-Unique: XLIsRPsHMpmLsJCec5o2qA-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-783900615d7so7586185a.0 for ; Wed, 24 Jan 2024 12:06:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706126763; x=1706731563; 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=5dIcr7TW+paqaSs/ZY312IdEV7gZIifDJHUsthomAf8=; b=hrQduvbj7YpLXU7YsZAL7Ddy0TmwkV6TfTNGafSQVhq78HJCXdk1VcZUA6VkjiOMOE xKp1NFmvnWdadgaqdTjHNiWz5hQnDluYbA2YG7MhwPsD7auoEAMUlv+GvwoROlC/PdQZ z/2brNHgDj1/lgzosc4pdhirFjtBlx2p3L/MM+3IJjP0PHnqJbcomsrhFSLLSJCR3J5u Sfajihi+e1v+Yjpr9nX6bbcVJd1LhKp6jNOsGjVusGq1BgSXwe9utA5/XQRkJSd03Kex pvMGhaMgZeZ09KFjbPyMb2pWfmeFk6EA7mX6RetrfT9+r8fh87fZvAoMylq/VvU9yvEQ DpZw== X-Gm-Message-State: AOJu0Yx8YuEdsAMI5YoNBlewMwNsceWRcSObO+9/mPAHjIc4hGMWtPxS KimilHA0X45DkVxYaSKZRObho/mJOSayuJoeic52VZ/m2/ZGjlTVAUOnz0bIuRgvnbOCwaw/jT/ 05PKw6fywGcsJ/tqfLGduT5BCmwJEp9k92NCt0wlGzpX6DvYFau17qp4wpsGOJ2E= X-Received: by 2002:a05:620a:4688:b0:783:b03f:aafd with SMTP id bq8-20020a05620a468800b00783b03faafdmr223574qkb.55.1706126762986; Wed, 24 Jan 2024 12:06:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuafiRDMpjInuXTqkjfB7CZMy+huKHjeRv0OdofSl0G7Imr7dSzrSw/het8+5Z9iNBXAbr4A== X-Received: by 2002:a05:620a:4688:b0:783:b03f:aafd with SMTP id bq8-20020a05620a468800b00783b03faafdmr223560qkb.55.1706126762561; Wed, 24 Jan 2024 12:06:02 -0800 (PST) Received: from [192.168.1.108] (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 b8-20020a05620a04e800b007838d964dc0sm4298027qkh.135.2024.01.24.12.06.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jan 2024 12:06:02 -0800 (PST) Message-ID: <077cd77b-9348-4d59-962e-5e914c9c6f9b@redhat.com> Date: Wed, 24 Jan 2024 15:06:01 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: Fix importing nested namespace declarations [PR100707] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Nathan Sidwell References: <65ac53c3.170a0220.103a8.110b@mx.google.com> From: Jason Merrill In-Reply-To: <65ac53c3.170a0220.103a8.110b@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=-12.2 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 1/20/24 18:14, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? OK. > -- >8 -- > > Currently, importing a namespace declarations marks it as imported, and > so marks it as originating from the module that it was imported from. > This is usually harmless, but causes problems with nested namespaces. > > In the linked PR, what happens is that the namespace 'A' imported from > the module ends up not being considered when creating the 'A' namespace > within its own TU, and thus it has its 'cp_binding_level' recreated. > However, by this point 'A::B' has already been imported, and so the > 'level_chain' member no longer correctly points at 'A's binding level, > so the sanity check for this in 'resume_scope' ICEs. > > Since as far as I can tell there's no reason for imported namespaces to > be attached to any specific module (namespace declarations with external > linkage are always attached to the global module by [module.unit] p7.2), > this patch just removes the 'imported' flag, which stops code from > caring about its originating module. > > This patch also makes some minor adjustments to existing tests to cater > for the new dumped name. > > PR c++/100707 > > gcc/cp/ChangeLog: > > * name-lookup.cc (add_imported_namespace): Don't mark namespaces > as imported. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/indirect-1_b.C: Adjust to handle namespaces not > being attached to the module they were imported from. > * g++.dg/modules/indirect-1_c.C: Likewise. > * g++.dg/modules/indirect-2_b.C: Likewise. > * g++.dg/modules/indirect-2_c.C: Likewise. > * g++.dg/modules/indirect-3_b.C: Likewise. > * g++.dg/modules/indirect-3_c.C: Likewise. > * g++.dg/modules/indirect-4_b.C: Likewise. > * g++.dg/modules/indirect-4_c.C: Likewise. > * g++.dg/modules/namespace-5_a.C: New test. > * g++.dg/modules/namespace-5_b.C: New test. > * g++.dg/modules/namespace-5_c.C: New test. > > Signed-off-by: Nathaniel Shead > --- > gcc/cp/name-lookup.cc | 1 - > gcc/testsuite/g++.dg/modules/indirect-1_b.C | 20 ++++++------- > gcc/testsuite/g++.dg/modules/indirect-1_c.C | 30 ++++++++++---------- > gcc/testsuite/g++.dg/modules/indirect-2_b.C | 20 ++++++------- > gcc/testsuite/g++.dg/modules/indirect-2_c.C | 10 +++---- > gcc/testsuite/g++.dg/modules/indirect-3_b.C | 16 +++++------ > gcc/testsuite/g++.dg/modules/indirect-3_c.C | 10 +++---- > gcc/testsuite/g++.dg/modules/indirect-4_b.C | 14 ++++----- > gcc/testsuite/g++.dg/modules/indirect-4_c.C | 8 +++--- > gcc/testsuite/g++.dg/modules/namespace-5_a.C | 6 ++++ > gcc/testsuite/g++.dg/modules/namespace-5_b.C | 7 +++++ > gcc/testsuite/g++.dg/modules/namespace-5_c.C | 5 ++++ > 12 files changed, 82 insertions(+), 65 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/modules/namespace-5_a.C > create mode 100644 gcc/testsuite/g++.dg/modules/namespace-5_b.C > create mode 100644 gcc/testsuite/g++.dg/modules/namespace-5_c.C > > diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc > index 15b5fba6297..e58f3b5cb4d 100644 > --- a/gcc/cp/name-lookup.cc > +++ b/gcc/cp/name-lookup.cc > @@ -9089,7 +9089,6 @@ add_imported_namespace (tree ctx, tree name, location_t loc, unsigned import, > if (!decl) > { > decl = make_namespace (ctx, name, loc, inline_p); > - DECL_MODULE_IMPORT_P (decl) = true; > make_namespace_finish (decl, slot, true); > } > else if (DECL_NAMESPACE_INLINE_P (decl) != inline_p) > diff --git a/gcc/testsuite/g++.dg/modules/indirect-1_b.C b/gcc/testsuite/g++.dg/modules/indirect-1_b.C > index c450fa9481c..39e9d21ab76 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-1_b.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-1_b.C > @@ -33,20 +33,20 @@ namespace bar > export extern auto const Scoped_Const_Three = foo::Scoped::D; > } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::frob'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::frob'@'foo' section:} module } } > // { dg-final { scan-lang-dump-not {namespace:-[0-9]* namespace_decl:'::foo'} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* function_decl:'::foo@foo:.::frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* function_decl:'::foo::frob@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::X'@'foo' section:} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* type_decl:'::foo@foo:.::X@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::X'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* type_decl:'::foo::X@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::Y'@'foo' section:} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* type_decl:'::foo@foo:.::Y@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::Y'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* type_decl:'::foo::Y@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::B'@'foo' section:} module } } > -// { dg-final { scan-lang-dump-not {Lazily binding '::foo@foo:.::C@foo:.'@'foo' section:} module } } > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::Scoped'@'foo' section:} module } } > -// { dg-final { scan-lang-dump-not {Lazily binding '::foo@foo:.::Scoped@foo:.::[ABCD]'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::B'@'foo' section:} module } } > +// { dg-final { scan-lang-dump-not {Lazily binding '::foo::C@foo:.'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::Scoped'@'foo' section:} module } } > +// { dg-final { scan-lang-dump-not {Lazily binding '::foo::Scoped@foo:.::[ABCD]'@'foo' section:} module } } > > // { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::C'@foo} module } } > // { dg_final { scan-lang-dump {Wrote named import:-[0-9]* const_decl:'::foo::Plain@\(foo\)::B'@foo} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-1_c.C b/gcc/testsuite/g++.dg/modules/indirect-1_c.C > index 73d5974c846..8ac0654a1eb 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-1_c.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-1_c.C > @@ -23,27 +23,27 @@ int main () > return 0; > } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::frob'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::frob'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[14\] section:4} module } } > -// { dg-final { scan-lang-dump {Named:-[0-9]* namespace_decl:'::foo@foo:1'@foo} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* function_decl:'::foo@foo:.::frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Named:-[0-9]* namespace_decl:'::foo'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* function_decl:'::foo::frob@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::quux'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::quux'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[1\] section:1} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* type_decl:'::foo@foo:.::X@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* type_decl:'::foo::X@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::Z'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::Z'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[8\] section:2} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* type_decl:'::foo@foo:.::Y@foo:.'@foo} module } } > -// { dg-final { scan-lang-dump {Read member:-[0-9]* field_decl:'::foo@foo:.::Y@foo:.::_vptr.Y'} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* function_decl:'::foo@foo:.::Y@foo:.::frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* type_decl:'::foo::Y@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Read member:-[0-9]* field_decl:'::foo::Y@foo:.::_vptr.Y'} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* function_decl:'::foo::Y@foo:.::frob@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::Plain_One'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::Plain_One'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[13\] section:3} module } } > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::Scoped_One'@'bar' section} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::Scoped_One'@'bar' section} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[15\] section:5} module } } > -// { dg-final { scan-lang-dump-not {Lazily binding '::foo@foo:.::[ABC]'@'foo' section:} module } } > -// { dg-final { scan-lang-dump-not {Lazily binding '::foo@foo:.::Scoped@\(foo\)::[ABC]'@'foo' section:} module } } > +// { dg-final { scan-lang-dump-not {Lazily binding '::foo::[ABC]'@'foo' section:} module } } > +// { dg-final { scan-lang-dump-not {Lazily binding '::foo::Scoped@\(foo\)::[ABC]'@'foo' section:} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::Plain_Const_Three'@'bar' section:} module } } > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::Scoped_Const_Three'@'bar' section} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::Plain_Const_Three'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::Scoped_Const_Three'@'bar' section} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-2_b.C b/gcc/testsuite/g++.dg/modules/indirect-2_b.C > index 16e060a2210..763899ed3e4 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-2_b.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-2_b.C > @@ -17,15 +17,15 @@ namespace bar > } > } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::frob'@'foo' section} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo@foo:.::template frob@foo:.'@foo} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo@foo:.::frob<0x0>'} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::frob'@'foo' section} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo::template frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo::frob<0x0>'} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::X'@'foo' section:} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo@foo:.::template X@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::X'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo::template X@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo@foo:.::X<0x0>'\n \[1\]=specialization declaration '::foo@foo:.::X<0x0>::__conv_op <0x0>'\n \[2\]=specialization declaration '::foo@foo:.::X<0x0>::X<0x0>'\n( \[.\]=[^\n]* '\n)*} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo@foo:.::X<0x0>'} module } } > -// { dg-final { scan-lang-dump {Depset:. specialization entity:. type_decl:'::foo@foo:.::X<0x0>'} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo@foo:.::X<0x0>'} module } } > -// { dg-final { scan-lang-dump {Wrote purview:-[0-9]* type_decl:'::foo@foo:.::X<0x0>'} module } } > +// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo::X<0x0>'\n \[1\]=specialization declaration '::foo::X<0x0>::__conv_op <0x0>'\n \[2\]=specialization declaration '::foo::X<0x0>::X<0x0>'\n( \[.\]=[^\n]* '\n)*} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo::X<0x0>'} module } } > +// { dg-final { scan-lang-dump {Depset:. specialization entity:. type_decl:'::foo::X<0x0>'} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo::X<0x0>'} module } } > +// { dg-final { scan-lang-dump {Wrote purview:-[0-9]* type_decl:'::foo::X<0x0>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-2_c.C b/gcc/testsuite/g++.dg/modules/indirect-2_c.C > index a5cf44ba785..855c9d1f025 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-2_c.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-2_c.C > @@ -13,13 +13,13 @@ int main () > return 0; > } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::frob'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::frob'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[4\] section:2} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo@foo:.::template frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo::template frob@foo:.'@foo} module } } > // { dg-final { scan-lang-dump-not {Wrote mergeable} module } } > > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::quux'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::quux'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[1\] section:1} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo@foo:.::template X@foo:.'@foo} module } } > -// { dg-final { scan-lang-dump {Read:-[0-9]* function_decl:'::foo@foo:.::frob<0x0>'} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo::template X@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Read:-[0-9]* function_decl:'::foo::frob<0x0>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-3_b.C b/gcc/testsuite/g++.dg/modules/indirect-3_b.C > index 038b01ecab7..a111bfbf11a 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-3_b.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-3_b.C > @@ -17,14 +17,14 @@ namespace bar > } > } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::X'@'foo' section} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo@foo:.::X@foo:.::template frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::X'@'foo' section} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo::X@foo:.::template frob@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::TPL'@'foo' section} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo@foo:.::template TPL@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::TPL'@'foo' section} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo::template TPL@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo@foo:.::TPL<0x0>'\n \[1\]=specialization definition '::foo@foo:.::TPL<0x0>::frob<0x0>'\n \[2\]=specialization declaration '::foo@foo:.::TPL<0x0>::TPL<0x0>'} module } } > +// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo::TPL<0x0>'\n \[1\]=specialization definition '::foo::TPL<0x0>::frob<0x0>'\n \[2\]=specialization declaration '::foo::TPL<0x0>::TPL<0x0>'} module } } > > -// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo@foo:.::X@foo:.::frob<0x0>'} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo@foo:.::TPL<0x0>'} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo@foo:.::X@foo:.::frob<0x0>'} module } } > +// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo::X@foo:.::frob<0x0>'} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo::TPL<0x0>'} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo::X@foo:.::frob<0x0>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-3_c.C b/gcc/testsuite/g++.dg/modules/indirect-3_c.C > index ec2fc768373..0178ffb17f4 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-3_c.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-3_c.C > @@ -13,12 +13,12 @@ int main () > return 0; > } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::quux'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::quux'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[5\] section:2} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo@foo:.::X@foo:.::template frob@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo::X@foo:.::template frob@foo:.'@foo} module } } > // { dg-final { scan-lang-dump-not {Instantiation:-[0-9]* function_decl:'::foo::X@foo:.::frob@.()<0x0>'} module } } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::toto'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::toto'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[.\] section:1} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo@foo:.::template TPL@foo:.'@foo} module } } > -// { dg-final { scan-lang-dump {Reading definition type_decl '::foo@foo:.::TPL@bar:.<0x0>'} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo::template TPL@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Reading definition type_decl '::foo::TPL@bar:.<0x0>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-4_b.C b/gcc/testsuite/g++.dg/modules/indirect-4_b.C > index 8c51ce8097b..702991d4d24 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-4_b.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-4_b.C > @@ -12,11 +12,11 @@ namespace bar > } > } > > -// { dg-final { scan-lang-dump {Lazily binding '::foo@foo:.::TPL'@'foo' section:} module } } > -// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo@foo:.::template TPL@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::foo::TPL'@'foo' section:} module } } > +// { dg-final { scan-lang-dump {Wrote import:-[0-9]* template_decl:'::foo::template TPL@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo@foo:.::TPL<0x1>'\n \[1\]=specialization declaration '::foo@foo:.::TPL<0x1>::template frob<#unnamed#>'\n \[2\]=specialization declaration '::foo@foo:.::TPL<0x1>::TPL<0x1>'\n( \[.\]=[^\n]* '\n)*} module } } > -// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo@foo:.::TPL<0x1>::frob<0x2>'} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo@foo:.::TPL<0x1>'} module } } > -// { dg-final { scan-lang-dump {Wrote purview:-[0-9]* type_decl:'::foo@foo:.::TPL<0x1>'} module } } > -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo@foo:.::TPL<0x1>::frob<0x2>'} module } } > +// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo::TPL<0x1>'\n \[1\]=specialization declaration '::foo::TPL<0x1>::template frob<#unnamed#>'\n \[2\]=specialization declaration '::foo::TPL<0x1>::TPL<0x1>'\n( \[.\]=[^\n]* '\n)*} module } } > +// { dg-final { scan-lang-dump {Cluster members:\n \[0\]=specialization definition '::foo::TPL<0x1>::frob<0x2>'} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s type spec merge key \(specialization\) type_decl:'::foo::TPL<0x1>'} module } } > +// { dg-final { scan-lang-dump {Wrote purview:-[0-9]* type_decl:'::foo::TPL<0x1>'} module } } > +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s decl spec merge key \(specialization\) function_decl:'::foo::TPL<0x1>::frob<0x2>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/indirect-4_c.C b/gcc/testsuite/g++.dg/modules/indirect-4_c.C > index d55a2216fb3..206891fe07a 100644 > --- a/gcc/testsuite/g++.dg/modules/indirect-4_c.C > +++ b/gcc/testsuite/g++.dg/modules/indirect-4_c.C > @@ -9,9 +9,9 @@ int main () > return 0; > } > > -// { dg-final { scan-lang-dump {Lazily binding '::bar@bar:.::quux'@'bar' section:} module } } > +// { dg-final { scan-lang-dump {Lazily binding '::bar::quux'@'bar' section:} module } } > // { dg-final { scan-lang-dump {>Loading entity foo\[.\] section:1} module } } > -// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo@foo:.::template TPL@foo:.'@foo} module } } > +// { dg-final { scan-lang-dump {Imported:-[0-9]* template_decl:'::foo::template TPL@foo:.'@foo} module } } > > -// { dg-final { scan-lang-dump {Reading definition function_decl '::foo@foo:.::TPL@bar:.<0x1>::frob@bar:.<0x2>'} module } } > -// { dg-final { scan-lang-dump {Reading definition type_decl '::foo@foo:.::TPL@bar:.<0x1>'} module } } > +// { dg-final { scan-lang-dump {Reading definition function_decl '::foo::TPL@bar:.<0x1>::frob@bar:.<0x2>'} module } } > +// { dg-final { scan-lang-dump {Reading definition type_decl '::foo::TPL@bar:.<0x1>'} module } } > diff --git a/gcc/testsuite/g++.dg/modules/namespace-5_a.C b/gcc/testsuite/g++.dg/modules/namespace-5_a.C > new file mode 100644 > index 00000000000..491eb1a1b45 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/namespace-5_a.C > @@ -0,0 +1,6 @@ > +// PR c++/100707 > +// { dg-additional-options "-fmodules-ts" } > +// { dg-module-cmi A } > + > +export module A; > +export namespace A {} > diff --git a/gcc/testsuite/g++.dg/modules/namespace-5_b.C b/gcc/testsuite/g++.dg/modules/namespace-5_b.C > new file mode 100644 > index 00000000000..76a43bff207 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/namespace-5_b.C > @@ -0,0 +1,7 @@ > +// PR c++/100707 > +// { dg-additional-options "-fmodules-ts" } > +// { dg-module-cmi A.B } > + > +export module A.B; > +import A; > +export namespace A::B {} > diff --git a/gcc/testsuite/g++.dg/modules/namespace-5_c.C b/gcc/testsuite/g++.dg/modules/namespace-5_c.C > new file mode 100644 > index 00000000000..93ccbf0c3a7 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/namespace-5_c.C > @@ -0,0 +1,5 @@ > +// PR c++/100707 > +// { dg-additional-options "-fmodules-ts" } > + > +import A.B; > +namespace A::B {}