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 6EAA63858D38 for ; Fri, 12 Apr 2024 17:47:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6EAA63858D38 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 6EAA63858D38 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=1712944072; cv=none; b=OY2wADy10lhnDTR9kZAPIiaFMSYPXkJCMT1QcpOkaI0lcpMUih9dB+UkRAYDXXQ2n4EFXdC/9VSN4pEF0egyHb64U69Tkp7BbosGcaySe2UuhwXMnwam4UKIbzll1+GOOpnlcRtopKnvVsFE+os/30FFGTF1BKABI6hgKNzr8g8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712944072; c=relaxed/simple; bh=AQ0EUdizmfK2uY2mE/JLny942jELoEHAqLW74jtMmgw=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=LVkVJHfCmcIJ4GUslFXJBkgRkWiNyRIeNAijAJCUgXRYQe5gHkhV6aQNeHapH0H4+/2fqJjosptNmyQfAz7KMXbciVE/X+0/hMZRs7WTv2D63vRUWoO+33ysM3GmGjS8AHrD0mLv+a3iiWpWDXUgt56xy0Dc0DOoxurlMpZxKGg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712944071; 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=KALev5ZCS/41LJJxzjxoxqtLwTAiqcgg+VDMmudL6kM=; b=LRhszO0MxyeX5PQEPNPQ8LmpvisJ2MYulkGPiW68YMua4G37lecSaadU8otU9UQUvakuJi e/vhGYI9fSS9xdzgIokyQwXGl2q1lC2LspCQ1pGrY6w2NC5ZChW299vNyE466br5N+twjp F7q6hhRuagk7CX+1cZ5taMXN9Js/+h4= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-563-wX_VHiRFON-13M5bY3rBDg-1; Fri, 12 Apr 2024 13:47:49 -0400 X-MC-Unique: wX_VHiRFON-13M5bY3rBDg-1 Received: by mail-oo1-f71.google.com with SMTP id 006d021491bc7-5aa3c983f88so941131eaf.3 for ; Fri, 12 Apr 2024 10:47:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712944069; x=1713548869; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KALev5ZCS/41LJJxzjxoxqtLwTAiqcgg+VDMmudL6kM=; b=TjnBLo/hyZ6p3zzaJft3EQiJTIHHx7g94lrr8IpIs2rY5UJbMex1wKPaHaVXpT4ME0 mI1LIztasFJ5kP8ToZVgsQvqUwtOWsbH+lQASrqiiduruJgE4OcSbip+xHtiiRDbdqzb 0ATdMyYqN9lC5YefUdhBa7kV21pk+DbVMng8lTRMSJB5eeKzsuO+UscHj7Y+LvtUPoj6 FtEaBZvnNOvEfIwhlJT+whoRVLsZYSbGtR1vtmACHY1FJ0FOJUwsurqabeenB7CHTllD XlRsX6EcoQhX88MadkpcDohfGmxk2e1KVzZ8sb9Bd9eICilq4dtnClc3Ub34gYMYRw25 w+7Q== X-Forwarded-Encrypted: i=1; AJvYcCVhdX1+5p6vQZ+sAaspVXctpBKYJGNMim1gtcUeo5ro245gpQTmwxyhS3bEZwntDfs/mY+0vcgDzdebT0903vdb5fznr+p2sw== X-Gm-Message-State: AOJu0Yw5y9lXZZmyeJSpuBxRduQ0/fV7GYI3/NWjDR+DaXb2Q0XNkVm6 0byMd1TqtbQqPNEAZH5NbyP0jJlKkYJMo3cWcjcYI4VZgvKVIOOiMrGJ+ZDNxT9V+2lE2P6kaYK jGT9c9BWEZioENToDc5IM9NiNiAMx9KYHodWmsMCBfPrKQqC/8B9gods= X-Received: by 2002:a05:6359:5f06:b0:186:19fa:5e30 with SMTP id lf6-20020a0563595f0600b0018619fa5e30mr3479129rwc.25.1712944068931; Fri, 12 Apr 2024 10:47:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbH/IjDixH/ECh/ctQAjdCcpxvst1hIQKgllQccoeME8W2xRh6J6XAQWXGc6NhOt9gATULwQ== X-Received: by 2002:a05:6359:5f06:b0:186:19fa:5e30 with SMTP id lf6-20020a0563595f0600b0018619fa5e30mr3479088rwc.25.1712944067899; Fri, 12 Apr 2024 10:47:47 -0700 (PDT) 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 c12-20020a0ceb4c000000b0069b5672bab8sm1292920qvq.134.2024.04.12.10.47.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Apr 2024 10:47:47 -0700 (PDT) Message-ID: Date: Fri, 12 Apr 2024 13:47:46 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/3] c++/modules: Only emit exported GMF usings [PR114600] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Nathan Sidwell , Patrick Palka References: <66188279.170a0220.e9635.a08c@mx.google.com> <661882e6.170a0220.5eebf.5da0@mx.google.com> From: Jason Merrill In-Reply-To: <661882e6.170a0220.5eebf.5da0@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.5 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,SPF_HELO_NONE,SPF_NONE,TXREP,URIBL_BLACK 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 4/11/24 20:40, Nathaniel Shead wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, OK for trunk? OK. > -- >8 -- > > A typo in r14-6978 made us emit too many things. This ensures that we > don't emit using-declarations from the GMF that we don't need to. > > PR c++/114600 > > gcc/cp/ChangeLog: > > * module.cc (depset::hash::add_binding_entity): Require both > WMB_Using and WMB_Export for GMF entities. > > gcc/testsuite/ChangeLog: > > * g++.dg/modules/using-14.C: New test. > > Signed-off-by: Nathaniel Shead > Co-authored-by: Patrick Palka > --- > gcc/cp/module.cc | 2 +- > gcc/testsuite/g++.dg/modules/using-14.C | 14 ++++++++++++++ > 2 files changed, 15 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/modules/using-14.C > > diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc > index 4e91fa6e052..9d054c4c792 100644 > --- a/gcc/cp/module.cc > +++ b/gcc/cp/module.cc > @@ -12892,7 +12892,7 @@ depset::hash::add_binding_entity (tree decl, WMB_Flags flags, void *data_) > inner = DECL_TEMPLATE_RESULT (inner); > > if ((!DECL_LANG_SPECIFIC (inner) || !DECL_MODULE_PURVIEW_P (inner)) > - && !(flags & (WMB_Using | WMB_Export))) > + && !((flags & WMB_Using) && (flags & WMB_Export))) > /* Ignore global module fragment entities unless explicitly > exported with a using declaration. */ > return false; > diff --git a/gcc/testsuite/g++.dg/modules/using-14.C b/gcc/testsuite/g++.dg/modules/using-14.C > new file mode 100644 > index 00000000000..0e15a952de5 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/modules/using-14.C > @@ -0,0 +1,14 @@ > +// PR c++/114600 > +// { dg-additional-options "-fmodules-ts -Wno-global-module -fdump-lang-module" } > +// { dg-module-cmi M } > + > +module; > +namespace std { > + template struct A { int n; }; > + template A f(); > + namespace __swappable_details { using std::f; } > +} > +export module M; > + > +// The whole GMF should be discarded here > +// { dg-final { scan-lang-dump "Wrote 0 clusters" module } }