From: Jason Merrill <jason@redhat.com>
Date: Mon, 23 May 2011 15:48:37 +0000 (-0400)
Subject: re PR c++/47263 ([C++0x] lambda + dynamic-exception-specification std::unexpected... 
X-Git-Tag: releases/gcc-4.7.0~6581
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86d822aa63c1694e896ab66c92fa660fc4864c9f;p=thirdparty%2Fgcc.git

re PR c++/47263 ([C++0x] lambda + dynamic-exception-specification std::unexpected() is not called.)

	PR c++/47263
	* decl.c (use_eh_spec_block): Do use an EH spec block for a
	lambda op().

From-SVN: r174076
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cfb6b58065c4..ea617dfe947b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-23  Jason Merrill  <jason@redhat.com>
 
+	PR c++/47263
+	* decl.c (use_eh_spec_block): Do use an EH spec block for a
+	lambda op().
+
 	PR c++/49058
 	* call.c (splice_viable): Be strict in templates.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 733157a3dfa7..234daafb8a12 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12759,7 +12759,7 @@ use_eh_spec_block (tree fn)
 	     not creating the EH_SPEC_BLOCK we save a little memory,
 	     and we avoid spurious warnings about unreachable
 	     code.  */
-	  && !DECL_ARTIFICIAL (fn));
+	  && !DECL_DEFAULTED_FN (fn));
 }
 
 /* Store the parameter declarations into the current function declaration.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c41c7f607533..72aae61f3ef4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-23  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/cpp0x/lambda/lambda-eh2.C: New.
+
 	* g++.dg/cpp0x/sfinae24.C: New.
 
 	* g++.dg/cpp0x/error3.C: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
new file mode 100644
index 000000000000..1490a250837a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-eh2.C
@@ -0,0 +1,16 @@
+// PR c++/47263
+// { dg-options -std=c++0x }
+// { dg-do run }
+
+#include <exception>
+
+int main( void )
+{
+  std::set_unexpected( []{ throw 0; } );
+  try
+    {
+      []() throw( int ) { throw nullptr; }();
+    }
+  catch( int )
+    { }
+}