From patchwork Tue Dec 22 20:44:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1419470 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=acm.org 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=HCaSKpda; 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D0pGn62pDz9sVY for ; Wed, 23 Dec 2020 07:44:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 728C0382E06C; Tue, 22 Dec 2020 20:44:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by sourceware.org (Postfix) with ESMTPS id 1D15D3858031 for ; Tue, 22 Dec 2020 20:44:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1D15D3858031 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-x734.google.com with SMTP id p14so13144834qke.6 for ; Tue, 22 Dec 2020 12:44:13 -0800 (PST) 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=ZHIWX8HCCYADXdP16eH984UcJ67id4HcF5iPrOR47GE=; b=HCaSKpdaEbcRhPRvlQoTyfFeeFLDL5qEvw2qFCxR3KcbHOgBIHeHaZuCNr+EZ5SaVn m/bULh/ogUSGWUzd5kBGyuJw2aAHXsJJZW+p9FYtRkVEM6xqhTL6gVdcHeOpDPJ9mp5s ZUf2sR9LCganSxE5tvRWEYO5ZQ2Fbss60YzLziy9QeSON+djIkjqvJUbQR0OUJuWb9os XZJCYq04qsGfpJ9dfuu3mvskNAivWaB5NFWNVap9ipWjDzIPqXoybBCv0x8G/N6EID8d 5OGytwY5qjZPiS9Fa4+e4Qi3ij/a6hz3ZSyqBxpVAbWDq0vBqPHMMZADzEtueCNaWDJD a0dA== 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=ZHIWX8HCCYADXdP16eH984UcJ67id4HcF5iPrOR47GE=; b=Uu4Ivr4zI86UwSKQrVVopL0BUnXFII4QNcK82fBK9eih/h0n7BN7FmpqO6me5FWDCE /mole8mDNBvjOEtxoIsFytDHF7RPR1iluBZWGjyLSoidYM52cKdSLRdh3MsfEpP6tvZl CIycMZOd1RF3e61iaQ0A1Dw3mfKgabS6nHpFVjciNgNov/kBdNOvWVkuzy3yY5M58Qsf +pwcdXPQzFetu9UAj4zB16jn80jK9MrJHBLjMRNZjxhgPzot7grBt9dFf3zCJ/YK66ZS fad13m2Ogu899vv4b3SJdauX/WsFAkm75DuK2pfL2y/OOJObccreZKTnFYfhGXBEdWlT H6pQ== X-Gm-Message-State: AOAM533kZKQUfnhk8RPvE/QGFQMiupUuCMG8y9S3ygU9ZEKVBkBHWBr2 2OQGzAZUJzGU+gHFpdaL4Rc= X-Google-Smtp-Source: ABdhPJycb5uVxenMGRsVd+9WZnKvW8c6ldyn3vpgGbqa1J26ETChvMJswk298ZGly7ycCoPy3UkM/g== X-Received: by 2002:a37:e10c:: with SMTP id c12mr24577566qkm.265.1608669852520; Tue, 22 Dec 2020 12:44:12 -0800 (PST) Received: from ?IPv6:2620:10d:c0a8:1102:3c47:94ca:3ae4:1cf? ([2620:10d:c091:480::1:f789]) by smtp.googlemail.com with ESMTPSA id z20sm13522068qtb.31.2020.12.22.12.44.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Dec 2020 12:44:11 -0800 (PST) To: GCC Patches From: Nathan Sidwell Subject: c++: Module ICE fix Message-ID: <7b255c08-9b25-46b3-a143-bc961404436b@acm.org> Date: Tue, 22 Dec 2020 15:44:10 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-11.0 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" A missing check for decl lang specific has made itself apparent. gcc/cp/ * module.cc (has_definition): Check DECL_LANG_SPECIFIC. (test in the next uber-patch) diff --git i/gcc/cp/module.cc w/gcc/cp/module.cc index ed3dbe244a3..19fe66346bd 100644 --- i/gcc/cp/module.cc +++ w/gcc/cp/module.cc @@ -11374,7 +11374,8 @@ has_definition (tree decl) break; case VAR_DECL: - if (DECL_TEMPLATE_INFO (decl) + if (DECL_LANG_SPECIFIC (decl) + && DECL_TEMPLATE_INFO (decl) && DECL_USE_TEMPLATE (decl) < 2) return DECL_INITIAL (decl); else