From: Jason Merrill <jason@redhat.com>
Date: Thu, 12 Feb 2015 22:44:38 +0000 (-0500)
Subject: re PR c++/64898 (qtgui-4.8.6 build error)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b95b65ced07d1540b713cb926468a1de87b8b49;p=gcc.git

re PR c++/64898 (qtgui-4.8.6 build error)

	PR c++/64898
	* mangle.c (write_mangled_name): Fix test for variable template
	instantiation.

From-SVN: r220666
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f7564644e2..f181554219a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2015-02-12  Jason Merrill  <jason@redhat.com>
 
+	PR c++/64898
+	* mangle.c (write_mangled_name): Fix test for variable template
+	instantiation.
+
 	* decl.c (begin_destructor_body): Condition clobber on
 	-flifetime-dse.
 
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 45377fc02e4..fbf4bf27c07 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -682,7 +682,8 @@ write_mangled_name (const tree decl, bool top_level)
     }
   else if (VAR_P (decl)
 	   /* Variable template instantiations are mangled.  */
-	   && !(DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl))
+	   && !(DECL_LANG_SPECIFIC (decl) && DECL_TEMPLATE_INFO (decl)
+		&& variable_template_p (DECL_TI_TEMPLATE (decl)))
 	   /* The names of non-static global variables aren't mangled.  */
 	   && DECL_EXTERNAL_LINKAGE_P (decl)
 	   && (CP_DECL_CONTEXT (decl) == global_namespace
diff --git a/gcc/testsuite/g++.dg/abi/mangle65.C b/gcc/testsuite/g++.dg/abi/mangle65.C
new file mode 100644
index 00000000000..13169c2797d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/mangle65.C
@@ -0,0 +1,13 @@
+// PR c++/64898
+// { dg-final { scan-assembler-not "_Z6foovar" } }
+
+template <class> void f()
+{
+  extern int foovar;
+  foovar = 42;
+}
+
+int main()
+{
+  f<int>();
+}