From 89b7df3a100b30f91343c688ea34f0a2d02792e0 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 16 Feb 2012 19:42:08 +0000
Subject: [PATCH] 	PR c++/51415 	* error.c (dump_expr): Handle lambda
 closures specifically.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184314 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                                | 5 +++++
 gcc/cp/error.c                                  | 2 ++
 gcc/testsuite/ChangeLog                         | 5 +++++
 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err1.C | 8 ++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 864b6d34506..773f3645249 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51415
+	* error.c (dump_expr): Handle lambda closures specifically.
+
 2012-02-14  Jason Merrill  <jason@redhat.com>
 
 	* parser.c (cp_parser_explicit_instantiation): Give a warning
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 09c6caec9a4..4ec263b0c3f 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2189,6 +2189,8 @@ dump_expr (tree t, int flags)
 		}
 	    }
 	}
+      if (TREE_TYPE (t) && LAMBDA_TYPE_P (TREE_TYPE (t)))
+	pp_string (cxx_pp, "<lambda closure object>");
       if (TREE_TYPE (t) && EMPTY_CONSTRUCTOR_P (t))
 	{
 	  dump_type (TREE_TYPE (t), 0);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 76f2bb619fe..4ae411963b7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51415
+	* g++.dg/cpp0x/lambda/lambda-err1.C: New.
+
 2012-02-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/52255
diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err1.C
new file mode 100644
index 00000000000..ebf0cbd078d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err1.C
@@ -0,0 +1,8 @@
+// PR c++/51415
+// { dg-do compile { target c++11 } }
+
+void foo()
+{
+  int x[1];
+  [x]{} = 0;			// { dg-error "lambda closure" }
+}
-- 
2.11.4.GIT