From 25dea9abbf4ce91ba740dd5c8b7c9c2f603861b0 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 15 Mar 2016 19:37:37 +0000
Subject: [PATCH] 	PR c++/70095 	* pt.c (instantiate_decl): Fix call to
 variable_template_p.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234231 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                         |  3 +++
 gcc/cp/pt.c                              |  2 +-
 gcc/testsuite/g++.dg/cpp1y/var-templ50.C | 11 +++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/var-templ50.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9ace01eddbaa..eff989b160fe 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2016-03-15  Jason Merrill  <jason@redhat.com>
 
+	PR c++/70095
+	* pt.c (instantiate_decl): Fix call to variable_template_p.
+
 	PR c++/70141
 	* pt.c (for_each_template_parm_r): Always walk into TYPENAME_TYPE.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 724d6e994413..e8cfb660ad06 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -21935,7 +21935,7 @@ instantiate_decl (tree d, int defer_ok,
       if (enter_context)
         pop_nested_class ();
 
-      if (variable_template_p (td))
+      if (variable_template_p (gen_tmpl))
 	note_variable_template_instantiation (d);
     }
   else if (TREE_CODE (d) == FUNCTION_DECL && DECL_DEFAULTED_FN (code_pattern))
diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ50.C b/gcc/testsuite/g++.dg/cpp1y/var-templ50.C
new file mode 100644
index 000000000000..138a39971229
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/var-templ50.C
@@ -0,0 +1,11 @@
+// PR c++/70095
+// { dg-do link { target c++14 } }
+
+template <typename T> struct Foo;
+template <typename T> int variable_template         = 0;
+template <typename T> int variable_template<Foo<T>> = 0;
+template <typename T> int get_variable_template() { return variable_template<T>; }
+
+int main() {
+  get_variable_template<Foo<int>>();
+}
-- 
2.47.3