/cp

2011-03-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/47974
	* pt.c (tsubst_template_args): Check argument t for error_mark_node.

/testsuite
2011-03-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/47974
	* g++.dg/template/crash106.C: New.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ef766fb..747457a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/47974
+       * pt.c (tsubst_template_args): Check argument t for error_mark_node.
+
 2011-03-03  Jason Merrill  <jason@redhat.com>
 
        PR c++/47950

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 60b2699..c52bb74 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8966,9 +8966,14 @@ static tree
 tsubst_template_args (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 {
   tree orig_t = t;
-  int len = TREE_VEC_LENGTH (t);
-  int need_new = 0, i, expanded_len_adjust = 0, out;
-  tree *elts = XALLOCAVEC (tree, len);
+  int len, need_new = 0, i, expanded_len_adjust = 0, out;
+  tree *elts;
+
+  if (t == error_mark_node)
+    return error_mark_node;
+
+  len = TREE_VEC_LENGTH (t);
+  elts = XALLOCAVEC (tree, len);
 
   for (i = 0; i < len; i++)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f7a372..69b7569 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/47974
+       * g++.dg/template/crash106.C: New.
+
 2011-03-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/47963

diff --git a/gcc/testsuite/g++.dg/template/crash106.C b/gcc/testsuite/g++.dg/template/crash106.C
new file mode 100644 (file)
index 0000000..c2d117e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash106.C
@@ -0,0 +1,12 @@
+// PR c++/47974
+
+typedef double T;
+
+struct A
+{
+  template<T> void foo(); // { dg-error "type" }
+};
+
+template<T N = 0, void (A::*)() = &A::foo<N> > struct B {}; // { dg-error "type|declared" }
+
+B<> b; // { dg-error "type|declaration" }