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 7B7463858D3C for ; Thu, 27 Apr 2023 01:45:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B7463858D3C 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=1682559948; 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=S2D6B4JLdH/xp9PxxZDf52bn+l0uZXa6Lev5fq+LaBE=; b=fqWBLXII9At5ks7EJ+6Z97XBs2MY8ayu/vmSKCA6KNdjQrL+hZjZOHo0wexI968y+ZuMIO 6TngdwcQfPqBszx8fuQFDfl/LuOKJ7lYjszV3VsiEoDwJJbqpQOs+CZKHtLpfyMhwm/Zbt 3jrKNkPj4PCxoWcumrrd93675k84owQ= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-573-NdQ2EdrwPXakhfFWRUMhuA-1; Wed, 26 Apr 2023 21:45:46 -0400 X-MC-Unique: NdQ2EdrwPXakhfFWRUMhuA-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-3ef67ad5ffaso74293921cf.2 for ; Wed, 26 Apr 2023 18:45:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682559945; x=1685151945; 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=S2D6B4JLdH/xp9PxxZDf52bn+l0uZXa6Lev5fq+LaBE=; b=AZpqNiNqKkpISfaras9NgsPmRjVl7Cp526l5y8wJuQ4DdrpApUUa6X/6R9JdZvLXkv SRyVBlaUZt6No+WXGMb1r0Okq/s1W+kBoZxIfIW/Zg7Bp0Mzjuizgs3nCvXQ2pOL2fDC /qEoN3Ppc48p8Oh+DWOmoFQe3hCHlmysU3qDA6xt0JtX/B1JM0QPpeiVMxmoY+F6AZF9 LUnicPIvCe6onvAMZQGrP3BdKOOBZ34iCzUBISMBq7ZDpgVg8lGHgcxjCwc9dWIXw3A7 3YC1aVIAmGW+JpHqgCvCG/pWsqENB7dL1W2K1sEZzCEcxu8rSK6eUYXvscwCD5mttsyy Ny+g== X-Gm-Message-State: AAQBX9cf/fqzqAjt7HOWXEjd8jiCgpVKKkOndO4mUUcFfy/c7vdSq/No 9B0mXz2x2zPdEkLoOVZSKItBNe64OS8mUxH2sf3y0vxsGSxeRDfRmm5YeylnxQlIN1CajYrTdzO oKhXxJ1f/HVVa5E3Le0+TUED5m3XCRT9IkI+LJedB4M9tpOU8gO35DoXYZwdCOrPxDpU/Dxmv7g == X-Received: by 2002:ac8:5bd5:0:b0:3ed:164c:684a with SMTP id b21-20020ac85bd5000000b003ed164c684amr41809512qtb.40.1682559945648; Wed, 26 Apr 2023 18:45:45 -0700 (PDT) X-Google-Smtp-Source: AKy350bZ2/nZDVhr7Y6cySeJq4YMSLlJbKq8dgJhwdE+IAkdG6r/ztjlCrNg7looRkLa7ngpyloE7A== X-Received: by 2002:ac8:5bd5:0:b0:3ed:164c:684a with SMTP id b21-20020ac85bd5000000b003ed164c684amr41809496qtb.40.1682559945282; Wed, 26 Apr 2023 18:45:45 -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 f1-20020ac80681000000b003ef3eae106csm5716144qth.60.2023.04.26.18.45.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 18:45:44 -0700 (PDT) From: Jason Merrill To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: restore instantiate_decl assert Date: Wed, 26 Apr 2023 21:45:42 -0400 Message-Id: <20230427014542.539011-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< -- For PR61445 I removed this assert, but PR108242 demonstrated why it's still useful; to avoid regressing the former testcase I check pattern_defined in the assert. This reverts r212524. PR c++/61445 gcc/cp/ChangeLog: * pt.cc (instantiate_decl): Assert !defer_ok for local class members. --- gcc/cp/pt.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 93a055c66a1..6df16fef0dd 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -27090,6 +27090,12 @@ instantiate_decl (tree d, bool defer_ok, bool expl_inst_class_mem_p) pattern_defined = ! DECL_EXTERNAL (code_pattern); } + /* Any local class members should be instantiated from the TAG_DEFN + with defer_ok == 0. */ + gcc_checking_assert (!defer_ok || !pattern_defined + || !decl_function_context (d) + || LAMBDA_TYPE_P (DECL_CONTEXT (d))); + /* We may be in the middle of deferred access check. Disable it now. */ push_deferring_access_checks (dk_no_deferred); base-commit: 9b40ca2569d71e54d7dbbdbfd00d733770576f6f -- 2.31.1