From patchwork Tue Mar 23 12:20:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1457168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XeUM3lCz; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4Vp42jdLz9sSC for ; Tue, 23 Mar 2021 23:20:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E86E3860C3F; Tue, 23 Mar 2021 12:20:54 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 836B1385701F for ; Tue, 23 Mar 2021 12:20:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 836B1385701F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qk1-x735.google.com with SMTP id i9so14003772qka.2 for ; Tue, 23 Mar 2021 05:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=eO0YgyjkNeDXoTr/Km0qQRIBZI+t6dWgOcor3wmc9dQ=; b=XeUM3lCz1OhKx9ca5MGIETZLGRFQs3VrgSr7caqFN1CoiuGDo1p77UPwhkAYaPHM1g PdB9qRzPafPVOP4Gjk9teMqbPKDknNu12ern/m0HgaMSC97/I3cm7OY0n3onLTtspjpP PMIaEBCLHNazoGkJiTGjOum05lI+1iJPj8SgdydYQECJERgnOXcAw+t7SfsmnyWx45YH 1INVrXOYz/on2SQMY+RjVbKNjQkJfXikxuFZXjvjwJFFhoDCQ2NASxSkLsGQZq9o+vmO czXJ54JviaHE5Vy3Y6zb0pdBKe3n+fcUqzkZKNHCswcN4abHkhZ71hQCS86MITBRXxa1 4zsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=eO0YgyjkNeDXoTr/Km0qQRIBZI+t6dWgOcor3wmc9dQ=; b=PIdEtdbP4Th9OCi67eEHzy18Wwct/Bk2y6viR322o1rJf5eOr4ZgkLnlrpCghZyi8b 4MbGKzGPghO70tTpKjInkhFzJ5ku7Y+Qyz7wErnCt3XjLWZmbudNf6sFM/ObofANFTBq CfjBD8cAoMMBcNYC9nCVHkN9+M/pXrRuBcSAn3Zu/+ItQsnQgmT3QSjdfP3GjhqrvPp3 QFPaTIBss2+oqmlS/hi7EjMT68NAy9gaR+YoaM5DLqeGeA3pjx6Ws61jhLtX51XXB7hO Pm2DvizZCqzTOkw15YAaKgYCrWyTV1pRl0GZus2VJdeYW35dkKPdD+rcpGFNP6u3ehSg WtoQ== X-Gm-Message-State: AOAM5314mKyPnmplj/iqq8ktnBTL94AhT0Zf+tt+IkvUnpsqLt+zpj7I 4GlvUuPc7jLK4aEzEFr/pvA= X-Google-Smtp-Source: ABdhPJzmnunlQEZJvUyVT9OtaGXgTVMU1q+QEzA6bWudICL0xS4EVKHrHXk8iHUtV2f7yS0ryl0CsA== X-Received: by 2002:a37:68c1:: with SMTP id d184mr4738762qkc.395.1616502052065; Tue, 23 Mar 2021 05:20:52 -0700 (PDT) Received: from ?IPv6:2620:10d:c0a8:1102:5116:2685:d613:dbb6? ([2620:10d:c091:480::1:de1c]) by smtp.googlemail.com with ESMTPSA id y8sm11056596qtn.68.2021.03.23.05.20.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Mar 2021 05:20:51 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Over-zealous assert [PR 99239] Message-ID: Date: Tue, 23 Mar 2021 08:20:50 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This was simply an overzealous assert. Possibly correct thinking at the time that code was written, but not true now. Of course we can have imported artificial decls. PR c++/99239 gcc/cp/ * decl.c (duplicate_decls): Remove assert about maybe-imported artificial decls. gcc/testsuite/ * g++.dg/modules/pr99239_a.H: New. * g++.dg/modules/pr99239_b.H: New. diff --git c/gcc/cp/decl.c w/gcc/cp/decl.c index 8e8f37d060e..289db3074be 100644 --- c/gcc/cp/decl.c +++ w/gcc/cp/decl.c @@ -2041,8 +2041,6 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden) { if (DECL_ARTIFICIAL (olddecl)) { - gcc_checking_assert (!(DECL_LANG_SPECIFIC (olddecl) - && DECL_MODULE_IMPORT_P (olddecl))); if (!(global_purview_p () || not_module_p ())) error ("declaration %qD conflicts with builtin", newdecl); else diff --git c/gcc/testsuite/g++.dg/modules/pr99239_a.H w/gcc/testsuite/g++.dg/modules/pr99239_a.H new file mode 100644 index 00000000000..35f006fe9b2 --- /dev/null +++ w/gcc/testsuite/g++.dg/modules/pr99239_a.H @@ -0,0 +1,13 @@ +// PR 99239 ICE on catch clause +// { dg-additional-options -fmodule-header } +// { dg-module-cmi {} } + +inline void Foo () +{ + try + {} + catch(...) + { + } +} + diff --git c/gcc/testsuite/g++.dg/modules/pr99239_b.H w/gcc/testsuite/g++.dg/modules/pr99239_b.H new file mode 100644 index 00000000000..92638d663c7 --- /dev/null +++ w/gcc/testsuite/g++.dg/modules/pr99239_b.H @@ -0,0 +1,12 @@ +// { dg-additional-options {-fmodule-header -fno-module-lazy} } +// { dg-module-cmi {} } +import "pr99239_a.H"; + +inline void + _M_remove_reference() throw() +{ + try + { } + catch(...) + { } +}