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 67BFB3858C52 for ; Fri, 23 Sep 2022 13:32:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 67BFB3858C52 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=1663939932; 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: in-reply-to:in-reply-to:references:references; bh=q3SJh4ScK6KqLtjTOERx+CVMYDZGwizdkTv2k3Ly0Vc=; b=c/lLsJQgeSn2U9EdfK3gPnuB0x1PyGqC7qhZ5gAm7vVcdmzCFtuyhKUAI+GpBHbn/ChX9d jIwFjNEo1TVCBPsc/XMeL3Xy9A5QdkCbSYHfZwW1KabeV45/N16OmkB9wr/D+pCVEEnYiz zjXBQlSeUUHNH7db2C3FOCOvxsaKtKI= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-447-2HwId69fOMWShK_b0bSNcw-1; Fri, 23 Sep 2022 09:32:08 -0400 X-MC-Unique: 2HwId69fOMWShK_b0bSNcw-1 Received: by mail-qv1-f70.google.com with SMTP id nl18-20020a056214369200b004ac52c4b0a4so8583436qvb.13 for ; Fri, 23 Sep 2022 06:32:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date; bh=q3SJh4ScK6KqLtjTOERx+CVMYDZGwizdkTv2k3Ly0Vc=; b=RugPdnN1bhZcKg8v0xfa+dh7ilB6Ruehiyc7AkAlorr4/nxhj8mjQr7wla/ZUkTAbb dC3+tYIx/liQDE6eybljAEQTZe/TeCkHh7Sr7EBAHK6izpvvlVmGhcaNbn+3XuA0ITU2 YsEzNnKnBwoXVh/lsUSf9XIYvfaVAu6TJ1bbQd8gdJRz+lmaM7UP+chCk7NGnGcrRPvZ UnnfhjTg3Zjk20ZoQABmmA7B0M2KEDntPrup4EoVkw0SHZhp6XyT7AwYNCA8jW7THCHH twvEMoi8xKQQpI8NN8HmMqeyZyOaiBr6OQHNhymg+xLFb6ZAHtKSF/DmYrB2AQWVFLIe 3v4g== X-Gm-Message-State: ACrzQf0NrwpsHE/wx5dHpibxXFNXLN2XTUxoVJFwie9KKAFd6e6VfhAE ZltRL6LOlPVuBew1g9XIwlEaK7/ZFPUJ1F8buH3ijb3TreBJMJDKXPzkmdzetcSFnllIB4XiR6c GYMPakh7KH4FZuvghMA== X-Received: by 2002:a05:622a:1a96:b0:35b:b868:fb1 with SMTP id s22-20020a05622a1a9600b0035bb8680fb1mr7122636qtc.116.1663939928346; Fri, 23 Sep 2022 06:32:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4JO4bTEQpJC9G+Y5Z+4G4+47TMqGVvAH4lQSlvuqtVD3nnzN/YAaSKnXwk1QbN84+/tvGs2A== X-Received: by 2002:a05:622a:1a96:b0:35b:b868:fb1 with SMTP id s22-20020a05622a1a9600b0035bb8680fb1mr7122604qtc.116.1663939928064; Fri, 23 Sep 2022 06:32:08 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id bp36-20020a05620a45a400b006bb78d095c5sm5869458qkb.79.2022.09.23.06.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 06:32:07 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Fri, 23 Sep 2022 09:32:06 -0400 (EDT) To: Nathan Sidwell cc: Patrick Palka , gcc-patches@gcc.gnu.org, jason@redhat.com Subject: Re: [PATCH] c++ modules: ICE with class NTTP argument [PR100616] In-Reply-To: <91a5a188-c4f2-39ff-fff4-8a667f515a19@acm.org> Message-ID: <0745ddf7-8e48-909b-d8e2-a9a1e4064cef@idea> References: <20220922182502.3218391-1-ppalka@redhat.com> <91a5a188-c4f2-39ff-fff4-8a667f515a19@acm.org> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-14.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_LOW,SPF_HELO_NONE,SPF_NONE,TXREP 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 Thu, 22 Sep 2022, Nathan Sidwell wrote: > On 9/22/22 14:25, Patrick Palka wrote: > > > index 80467c19254..722b64793ed 100644 > > --- a/gcc/cp/decl.cc > > +++ b/gcc/cp/decl.cc > > @@ -18235,9 +18235,11 @@ maybe_register_incomplete_var (tree var) > > { > > /* When the outermost open class is complete we can resolve any > > pointers-to-members. */ > > - tree context = outermost_open_class (); > > - incomplete_var iv = {var, context}; > > - vec_safe_push (incomplete_vars, iv); > > + if (tree context = outermost_open_class ()) > > + { > > + incomplete_var iv = {var, context}; > > + vec_safe_push (incomplete_vars, iv); > > + } > > My immediate thought here is eek! during stream in, the outermost_open_class > could be anything -- to do with the context that wanted to lookup of the thing > being streamed in, right? So, the above change is I think just papering over > a problem in this case. D'oh, makes sense. I suppose this second branch of maybe_register_incomplete_var shouldn't ever be taken during stream-in. > > not sure how to approach this. Judging by the two commits that introduced/modified this part of maybe_register_incomplete_var, r196852 and r214333, ISTM the code is really only concerned with constexpr static data members (whose initializer may contain a pointer-to-member for a currently open class). So maybe we ought to restrict the branch like so, which effectively disables this part of maybe_register_incomplete_var during stream-in, and guarantees that outermost_open_class doesn't return NULL if the branch is taken? Bootstrapped and regtested on x86_64-pc-linux-gnu. -- >8 -- Subject: [PATCH] c++ modules: ICE with class NTTP argument [PR100616] PR c++/100616 gcc/cp/ChangeLog: * decl.cc (maybe_register_incomplete_var): Restrict second branch to static data members from a currently open class. gcc/testsuite/ChangeLog: * g++.dg/modules/pr100616_a.C: New test. * g++.dg/modules/pr100616_b.C: New test. --- gcc/cp/decl.cc | 2 ++ gcc/testsuite/g++.dg/modules/pr100616_a.C | 8 ++++++++ gcc/testsuite/g++.dg/modules/pr100616_b.C | 10 ++++++++++ 3 files changed, 20 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/pr100616_a.C create mode 100644 gcc/testsuite/g++.dg/modules/pr100616_b.C diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 80467c19254..ea616f0e686 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -18230,6 +18230,8 @@ maybe_register_incomplete_var (tree var) vec_safe_push (incomplete_vars, iv); } else if (!(DECL_LANG_SPECIFIC (var) && DECL_TEMPLATE_INFO (var)) + && DECL_CLASS_SCOPE_P (var) + && currently_open_class (DECL_CONTEXT (var)) && decl_constant_var_p (var) && (TYPE_PTRMEM_P (inner_type) || CLASS_TYPE_P (inner_type))) { diff --git a/gcc/testsuite/g++.dg/modules/pr100616_a.C b/gcc/testsuite/g++.dg/modules/pr100616_a.C new file mode 100644 index 00000000000..788af2eb533 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr100616_a.C @@ -0,0 +1,8 @@ +// PR c++/100616 +// { dg-additional-options "-std=c++20 -fmodules-ts" } +// { dg-module-cmi pr100616 } +export module pr100616; + +template struct C { }; +struct A { }; +C c1; diff --git a/gcc/testsuite/g++.dg/modules/pr100616_b.C b/gcc/testsuite/g++.dg/modules/pr100616_b.C new file mode 100644 index 00000000000..a37eb08131b --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr100616_b.C @@ -0,0 +1,10 @@ +// PR c++/100616 +// { dg-additional-options "-std=c++20 -fmodules-ts" } +module pr100616; + +C c2; + +// FIXME: We don't reuse the artificial VAR_DECL for the class NTTP argument A{} +// from the other translation unit, which causes these types to be different. +using type = decltype(c1); +using type = decltype(c2); // { dg-bogus "conflicting" "" { xfail *-*-* } } -- 2.38.0.rc1.2.g4b79ee4b0c