From patchwork Thu Apr 27 01:45:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1774300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=G1NbSpwR; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q6JVX1f8Zz23vH for ; Thu, 27 Apr 2023 11:46:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F3E313858D3C for ; Thu, 27 Apr 2023 01:46:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F3E313858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682559969; bh=S2D6B4JLdH/xp9PxxZDf52bn+l0uZXa6Lev5fq+LaBE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=G1NbSpwRZ90VoycTzcvaGtIchw/sCt1cX/i/jKttbQeLjZkWvPLKgZE6q1Nj77Ot2 IZiOKD4O3puNu3Olj3HbREddocKuRLJQK7SuP87ocZLSc8AIWPf9WGHFP47aYGrw5H SI0mq2yaUG0rN+28VEGX4r6DRfG5awdaMddS7cgc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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) 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 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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(+) base-commit: 9b40ca2569d71e54d7dbbdbfd00d733770576f6f 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);