From patchwork Mon Apr 5 13:28:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1462373 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; 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=FDs2Lp11; 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 4FDWh32ZKSz9sTD for ; Mon, 5 Apr 2021 23:28:34 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 962D8388A80D; Mon, 5 Apr 2021 13:28:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 962D8388A80D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1617629311; bh=Fn1uA1BX7/S3gKwuR73gXwZ5F6hg/7UDBSkJGdvvzFo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FDs2Lp118ddhGxmW+L9vk/U/nyGyJVn+EfuB+uvAEE37Af/UD5FFcAHTnBWYVuDXZ QT+DKBXt/hkxpE0DnckyZzPwZCKC7YrMJtS4UK6DuFypPbTvqdbJxeBkDAXCDC6lwk GMuuY6Cl+/GzoVts94Xqnijh8wsEYUaaiRhXtHdo= 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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id BD17F385803F for ; Mon, 5 Apr 2021 13:28:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BD17F385803F Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-526-ffzrnv5vOKmWPlCFt0K27A-1; Mon, 05 Apr 2021 09:28:25 -0400 X-MC-Unique: ffzrnv5vOKmWPlCFt0K27A-1 Received: by mail-qt1-f198.google.com with SMTP id g14so8387523qtu.12 for ; Mon, 05 Apr 2021 06:28:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fn1uA1BX7/S3gKwuR73gXwZ5F6hg/7UDBSkJGdvvzFo=; b=lWOzYWq4290W+ZUYC5CiVnXOsFQWH6FONpc7oSinyXhTNMUC7IDAh+kmRmoc1ZO/P1 +MGYnJfMI7Goo17d9ivHvwPQ8DFO8USS3icwqq1ziNbr7ihirPFWz/DY81gVkXDGjXi+ mNE0+Nq58xD7ulIjIY4SckHl8erm5CY9pifBVO4dOfYs4TVfFGhCRD4q+JfYZBwR1vjO 5S/eSwtPIwQtt2Wo4CVPW8mzrcJqrVoyTteAAuzuZVndG/lwN9vCJneplucHj2nYpFmw gKaR14vAz8ankNTiBQ4xZHV4CjEPJQ9121nmltjl6rGe9/qXQqyv74Dj7I+6u52UMe3a 7Hfw== X-Gm-Message-State: AOAM533sxjdKHJr0ANvGWO90DzaLaXadk7uDzNfCCypFBB8zCtEU+Wma uHxXdEm8CbqBMVRBIO/IjKPV619+wHYx2oRlzqTuC6fbus2r1B2JzUl/YprWgXO81gUScZRhBHc tkICv4zL64FyvvfOC+57AwioXh9+QprxlmBQufwS84tWBT+jRVEmPJvABVWXV5Sktiw== X-Received: by 2002:a05:620a:e:: with SMTP id j14mr23772054qki.117.1617629304574; Mon, 05 Apr 2021 06:28:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwakLMAK6HD+ExjkBCMT7zPJapNpn9kVobBL9A1WwNrDAR3kae/y/NdpjwmdjI/9PwmCxh9OQ== X-Received: by 2002:a05:620a:e:: with SMTP id j14mr23772022qki.117.1617629304204; Mon, 05 Apr 2021 06:28:24 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id c27sm13273382qko.71.2021.04.05.06.28.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Apr 2021 06:28:23 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: extern template and static data member [PR99066] Date: Mon, 5 Apr 2021 09:28:21 -0400 Message-Id: <20210405132821.965479-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" 'extern template' should mean that the relevant symbols are never emitted. But in this case we were assuming that DECL_EXTERNAL was already set on the variable, so we just needed to clear DECL_NOT_REALLY_EXTERN. Since DECL_EXTERNAL was not set, we emitted a definition of npos. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: PR c++/99066 * pt.c (mark_decl_instantiated): Set DECL_EXTERNAL. gcc/testsuite/ChangeLog: PR c++/99066 * g++.dg/cpp0x/extern_template-6.C: New test. --- gcc/cp/pt.c | 5 ++++- gcc/testsuite/g++.dg/cpp0x/extern_template-6.C | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/extern_template-6.C base-commit: a99a7b0afe9a1f6f866e25b8572856ae8c1d3f8d diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1d19a59dd62..396e622c4db 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -24204,7 +24204,10 @@ mark_decl_instantiated (tree result, int extern_p) DECL_COMDAT (result) = 0; if (extern_p) - DECL_NOT_REALLY_EXTERN (result) = 0; + { + DECL_EXTERNAL (result) = 1; + DECL_NOT_REALLY_EXTERN (result) = 0; + } else { mark_definable (result); diff --git a/gcc/testsuite/g++.dg/cpp0x/extern_template-6.C b/gcc/testsuite/g++.dg/cpp0x/extern_template-6.C new file mode 100644 index 00000000000..8aff3ae6b02 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/extern_template-6.C @@ -0,0 +1,17 @@ +// PR c++/99066 +// { dg-do compile { target c++11 } } + +template struct basic_string { + static const int npos = 1; +}; +template const int basic_string::npos; + +struct e { template int f() const; }; + +template int e::f() const { + return basic_string::npos; +} + +extern template class basic_string; + +// { dg-final { scan-assembler-not "_ZN12basic_stringIcE4nposE" } }