From 6b6b60aff26f56467082fbaca583994b42694c3f Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 23 Dec 2005 23:16:12 +0000
Subject: [PATCH] re PR c++/24671 (ICE with zero-sized arrays)

	PR c++/24671
	* pt.c (instantiate_template): Handle SFINAE.
	PR c++/24671
	* g++.dg/template/sfinae3.C: New test.

From-SVN: r109022
---
 gcc/cp/ChangeLog                        |  5 +++++
 gcc/cp/pt.c                             |  2 ++
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/g++.dg/template/sfinae3.C | 17 +++++++++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/sfinae3.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6a6090a8af8..1279a44ebb6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-23  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24671
+	* pt.c (instantiate_template): Handle SFINAE.
+
 2005-12-23  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* decl.c (grokdeclarator): Improve diagnostic for friend
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 93dad098689..5b025ce7ff4 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9149,6 +9149,8 @@ instantiate_template (tree tmpl, tree targ_ptr, tsubst_flags_t complain)
   /* Substitute template parameters.  */
   fndecl = tsubst (DECL_TEMPLATE_RESULT (gen_tmpl),
 		   targ_ptr, complain, gen_tmpl);
+  if (fndecl == error_mark_node)
+    return error_mark_node;
 
   /* Now we know the specialization, compute access previously
      deferred.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3265ba5168c..fd0d3336607 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-23  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24671
+	* g++.dg/template/sfinae3.C: New test.
+
 2005-12-23  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* g++.dg/other/friend4.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/sfinae3.C b/gcc/testsuite/g++.dg/template/sfinae3.C
new file mode 100644
index 00000000000..8d141ea0ad1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/sfinae3.C
@@ -0,0 +1,17 @@
+// PR c++/24671
+// { dg-options "" }
+
+template<typename> struct A
+{
+  typedef int X;
+  static const int i = 0;
+};
+
+template<typename> struct B
+{
+  B(const B&); // { dg-error "candidate" }
+  typedef typename A<char[A<B>::i]>::X Y;
+  template<typename T> B(T, Y); // { dg-error "call" }
+};
+
+B<int> b(0,0); 
-- 
2.30.2