From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 21 Nov 2014 21:34:54 +0000 (+0000)
Subject: 	PR c++/63588
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b07d45d8c198abc82d6bb455983012886e05e083;p=thirdparty%2Fgcc.git

	PR c++/63588
	* pt.c (uses_template_parms): Handle null argument.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217948 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 033ce7b74992..89d4ade46f9c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-21  Jason Merrill  <jason@redhat.com>
+
+	PR c++/63588
+	* pt.c (uses_template_parms): Handle null argument.
+
 2014-11-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/63764
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 71b7af1c206f..1d6b916c003c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8294,6 +8294,9 @@ for_each_template_parm (tree t, tree_fn_t fn, void* data,
 int
 uses_template_parms (tree t)
 {
+  if (t == NULL_TREE)
+    return false;
+
   bool dependent_p;
   int saved_processing_template_decl;
 
diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ15.C b/gcc/testsuite/g++.dg/cpp1y/var-templ15.C
new file mode 100644
index 000000000000..7dd2dcdcf94f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/var-templ15.C
@@ -0,0 +1,5 @@
+// PR c++/63588
+// { dg-do compile { target c++14 } }
+
+template <class T> T elements;
+int i = elements <>;		// { dg-error "arguments" }