aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2014-11-21 16:34:54 -0500
committerJason Merrill <jason@gcc.gnu.org>2014-11-21 16:34:54 -0500
commit169fe7fa43bd721a26b59707b931e5799ead4e6a (patch)
tree706c8a0150ef348f6f7281a1eb5c3911d6d1905a /gcc
parent18ea3d61120e90daa10cb87231b4426cba8bee3f (diff)
downloadgcc-169fe7fa43bd721a26b59707b931e5799ead4e6a.zip
gcc-169fe7fa43bd721a26b59707b931e5799ead4e6a.tar.gz
gcc-169fe7fa43bd721a26b59707b931e5799ead4e6a.tar.bz2
re PR c++/63588 (ICE (segfault) on arm-linux-gnueabihf)
PR c++/63588 * pt.c (uses_template_parms): Handle null argument. From-SVN: r217948
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/testsuite/g++.dg/cpp1y/var-templ15.C5
3 files changed, 13 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 033ce7b..89d4ade 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 71b7af1..1d6b916 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 0000000..7dd2dcd
--- /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" }