From e9122e757f1054db4c76ef802eb52b7f5d9b20a4 Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 14 Sep 2011 16:19:59 +0000
Subject: [PATCH] /cp 2011-09-14  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50391
	* pt.c (regenerate_decl_from_template): Don't pass an error_mark_node
	to build_exception_variant.

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

	PR c++/50391
	* g++.dg/cpp0x/noexcept15.C: New.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aa4a31d1ca4..8b15ca663c9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50391
+	* pt.c (regenerate_decl_from_template): Don't pass an error_mark_node
+	to build_exception_variant.
+
 2011-09-13  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/48320
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 14073646a73..ee33daf1fb9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -17729,7 +17729,7 @@ regenerate_decl_from_template (tree decl, tree tmpl)
       specs = tsubst_exception_specification (TREE_TYPE (code_pattern),
 					      args, tf_error, NULL_TREE,
 					      /*defer_ok*/false);
-      if (specs)
+      if (specs && specs != error_mark_node)
 	TREE_TYPE (decl) = build_exception_variant (TREE_TYPE (decl),
 						    specs);
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3aa10de4853..28d1102b18d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50391
+	* g++.dg/cpp0x/noexcept15.C: New.
+
 2011-09-14  Tom de Vries  <tom@codesourcery.com>
 
 	PR middle-end/50251
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept15.C b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C
new file mode 100644
index 00000000000..5e8c40c2774
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C
@@ -0,0 +1,34 @@
+// PR c++/50391
+// { dg-options -std=c++0x }
+
+#include <type_traits>
+
+template<class Tp>
+  struct single
+  {
+    Tp elem;  // { dg-error "incomplete type" }
+
+    constexpr single(const Tp& e)
+    : elem(e) { }   // { dg-error "invalid field" }
+
+    single(single&& s) // { dg-error "not a member" }
+    noexcept(std::is_nothrow_move_constructible<Tp>::value) 
+    : elem(s.elem) { } // { dg-error "invalid field|no member" }
+  };
+
+template<class Tp>
+  constexpr single<typename std::decay<Tp>::type>
+  make_single(Tp&& x)
+  {
+    return single<typename std::decay<Tp>::type>(x);
+  }
+
+class Blob;  // { dg-error "forward declaration" }
+
+void
+foo(Blob *b)
+{
+  make_single(*b);
+}
+
+// { dg-prune-output "include" }
-- 
2.11.0