From e34b09225a117d9ca0b9b21b716dc84a9eb6ac06 Mon Sep 17 00:00:00 2001
From: Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
Date: Sun, 14 Nov 2004 10:57:00 +0000
Subject: [PATCH] re PR c++/17344 (completely wacky error with matching
 template template classes and default arguments)

	PR c++/17344
	* pt.c (coerce_template_parms): Only emit error message about
	invalid template argument when TF_ERROR.

	* g++.dg/template/defarg5.C: New test.

From-SVN: r90615
---
 gcc/cp/ChangeLog                        |  6 ++++++
 gcc/cp/pt.c                             |  5 ++++-
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/g++.dg/template/defarg5.C | 25 +++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/defarg5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fe51d5b5b5e..9ca645afeb6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-14  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/17344
+	* pt.c (coerce_template_parms): Only emit error message about
+	invalid template argument when TF_ERROR.
+
 2004-11-12  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/18389
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 54c997951ed..34fd27b5993 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4007,7 +4007,10 @@ coerce_template_parms (tree parms,
       
       gcc_assert (arg);
       if (arg == error_mark_node)
-	error ("template argument %d is invalid", i + 1);
+	{
+	  if (complain & tf_error)
+	    error ("template argument %d is invalid", i + 1);
+	}
       else 
 	arg = convert_template_argument (TREE_VALUE (parm), 
 					 arg, new_args, complain, i,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dbedb3e69ea..ef48eafaf43 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-14  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+	PR c++/17344
+	* g++.dg/template/defarg5.C: New test.
+
 2004-11-13  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* g++.dg/parse/cast1.C: Run only on ILP32.
diff --git a/gcc/testsuite/g++.dg/template/defarg5.C b/gcc/testsuite/g++.dg/template/defarg5.C
new file mode 100644
index 00000000000..b436374160d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/defarg5.C
@@ -0,0 +1,25 @@
+// { dg-do compile }
+
+// Origin: Ivan Godard <igodard@pacbell.net>
+//	   Wolfgang Bangerth <bangerth@dealii.org>
+
+// PR c++/17344: Substitution failure is not an error
+// for default template argument
+
+template <class> struct intTraits; 
+ 
+template<> struct intTraits<int> { 
+    static const int i = 0; 
+}; 
+ 
+template<typename E, E i = intTraits<E>::i> struct A {}; 
+ 
+struct S { 
+    template <template <typename> class X> S(X<void>); 
+}; 
+ 
+int bar(S); 
+int bar(A<int,0>); 
+ 
+A<int> bed; 
+int i = bar(bed); 
-- 
2.30.2