From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 25747396E85D; Fri, 13 May 2022 18:24:53 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25747396E85D
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r9-10179] c++: extern template and static data member [PR99066]
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-9
X-Git-Oldrev: 200d477d3cb1593dbaa7739c6270e0a7f6c564cf
X-Git-Newrev: 950a97a5039c7b96602edfdf8984b5800f5837f3
Message-Id: <20220513182453.25747396E85D@sourceware.org>
Date: Fri, 13 May 2022 18:24:53 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2022 18:24:53 -0000

https://gcc.gnu.org/g:950a97a5039c7b96602edfdf8984b5800f5837f3

commit r9-10179-g950a97a5039c7b96602edfdf8984b5800f5837f3
Author: Jason Merrill <jason@redhat.com>
Date:   Sun Apr 4 23:32:32 2021 -0400

    c++: extern template and static data member [PR99066]
    
    '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.
    
    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.

Diff:
---
 gcc/cp/pt.c                                    |  5 ++++-
 gcc/testsuite/g++.dg/cpp0x/extern_template-6.C | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 4bae467fa71..b8aa7f8cb6a 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -23171,7 +23171,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 <typename a> struct basic_string {
+  static const int npos = 1;
+};
+template <typename a> const int basic_string<a>::npos;
+
+struct e { template <bool> int f() const; };
+
+template <bool> int e::f() const {
+  return basic_string<char>::npos;
+}
+
+extern template class basic_string<char>;
+
+// { dg-final { scan-assembler-not "_ZN12basic_stringIcE4nposE" } }