From 6e851ef38328b42659f5c7dd16c51ca28b10778b Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 16 Jun 2011 22:09:05 +0000
Subject: [PATCH] 	PR c++/49229 	* pt.c (tsubst_decl) [FUNCTION_DECL]:
 Handle substitution failure.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175120 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                      |  3 +++
 gcc/cp/pt.c                           |  2 ++
 gcc/testsuite/ChangeLog               |  3 +++
 gcc/testsuite/g++.dg/cpp0x/sfinae26.C | 38 +++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/sfinae26.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a8baca2..000a781 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/49229
+	* pt.c (tsubst_decl) [FUNCTION_DECL]: Handle substitution failure.
+
 	PR c++/49251
 	* semantics.c (finish_id_expression): Mark even dependent
 	variables as used.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index ff145a2..1008b3b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9548,6 +9548,8 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
                                           (DECL_TEMPLATE_RESULT
                                                  (DECL_TI_TEMPLATE (t))),
 					   args, complain, in_decl);
+	    if (argvec == error_mark_node)
+	      RETURN (error_mark_node);
 
 	    /* Check to see if we already have this specialization.  */
 	    hash = hash_tmpl_and_args (gen_tmpl, argvec);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc12e7b..677ac71 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/49229
+	* g++.dg/cpp0x/sfinae26.C: New.
+
 	PR c++/49251
 	* g++.dg/cpp0x/variadic113.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae26.C b/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
new file mode 100644
index 0000000..5b8cdd9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae26.C
@@ -0,0 +1,38 @@
+// PR c++/49229
+// { dg-options -std=c++0x }
+
+extern void* enabler;
+
+template<bool, class = void>
+struct enable_if {};
+
+template<class T>
+struct enable_if<true, T> {
+  typedef T type;
+};
+
+template<class... Bn>
+struct and_;
+
+template<class B1>
+struct and_<B1> : B1 {};
+
+template<class, class>
+struct is_same {
+  static constexpr bool value = false;
+};
+
+template<class T>
+struct is_same<T, T> {
+  static constexpr bool value = true;
+};
+
+template<class... T>
+struct S {
+  template<class... U,
+    typename enable_if<and_<is_same<T, U>...>::value>::type*& = enabler
+  >
+  S(U...){} // #
+};
+
+S<bool> s(0);			// { dg-error "no match" }
-- 
2.7.4