/cp

2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43705
	* call.c (build_new_method_call): Return error_mark_node if fns is
	NULL_TREE.

/testsuite
2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43705
	* g++.dg/template/crash95.C: New.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 026abe8..634a74b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43705
+       * call.c (build_new_method_call): Return error_mark_node if fns is
+       NULL_TREE.
+

 2010-05-03  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/43953
 2010-05-03  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/43953

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 7915417..157b473 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6219,7 +6219,7 @@ build_new_method_call (tree instance, tree fns, VEC(tree,gc) **args,
     *fn_p = NULL_TREE;
 
   if (error_operand_p (instance)
     *fn_p = NULL_TREE;
 
   if (error_operand_p (instance)

-      || error_operand_p (fns))
+      || !fns || error_operand_p (fns))

     return error_mark_node;
 
   if (!BASELINK_P (fns))
     return error_mark_node;
 
   if (!BASELINK_P (fns))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 29eaf71..d43de64 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43705
+       * g++.dg/template/crash95.C: New.
+

 2010-05-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR debug/43508
 2010-05-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR debug/43508

diff --git a/gcc/testsuite/g++.dg/template/crash95.C b/gcc/testsuite/g++.dg/template/crash95.C
new file mode 100644 (file)
index 0000000..959a9d0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash95.C
@@ -0,0 +1,11 @@
+// PR c++/43705
+
+template < typename > struct S
+{
+  template < > struct S < int > // { dg-error "explicit|specialization|template|parameter" }
+  {
+    S(int);
+  };
+};
+
+S < int > s(0);