re PR c++/51412 ([c++0x] Broken diagnostic with invalid lambda expressions)

/cp
2013-03-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51412
	* cxx-pretty-print.c (pp_cxx_expression): Handle LAMBDA_EXPR.
	* error.c (dump_expr): Likewise.

/testsuite
2013-03-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51412
	* g++.dg/cpp0x/lambda/lambda-err3.C: New.

From-SVN: r196563

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 050717f1ba33ffb8ab2f32841707607a82a93932..f09fa0a8327c5f9cba3ac9db455bb115910c1d66 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/51412
+       * cxx-pretty-print.c (pp_cxx_expression): Handle LAMBDA_EXPR.
+       * error.c (dump_expr): Likewise.
+
 2013-03-08  Jason Merrill  <jason@redhat.com>
 
        PR c++/51884

diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index a92dfd4727509f7005c4235ff10cddb6e366a855..45ad20cd9a996fcd03cff47d2e997b80386e12f7 100644 (file)
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -1162,6 +1162,10 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
          }
       }
       break;
+      
+    case LAMBDA_EXPR:
+      pp_cxx_ws_string (pp, "<lambda>");
+      break;
 
     default:
       pp_c_expression (pp_c_base (pp), t);

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 60119ec6302a4e77eccced8280c94380c30a95d3..c2bf54dcb2caa5af739d70fa1bfd9df084235cdc 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2494,6 +2494,10 @@ dump_expr (tree t, int flags)
       dump_expr (resolve_virtual_fun_from_obj_type_ref (t), flags);
       break;
 
+    case LAMBDA_EXPR:
+      pp_string (cxx_pp, M_("<lambda>"));
+      break;
+
       /*  This list is incomplete, but should suffice for now.
          It is very important that `sorry' does not call
          `report_error_function'.  That could cause an infinite loop.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index feb546f083cfa14e35725bb2535869c4b51dff25..544d7fc134a2a06b887cffd0deeb2fb387f01c63 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/51412
+       * g++.dg/cpp0x/lambda/lambda-err3.C: New.
+
 2013-03-08  Marek Polacek  <polacek@redhat.com>
 
        PR tree-optimization/56478

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err3.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err3.C
new file mode 100644 (file)
index 0000000..fec01ac
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-err3.C
@@ -0,0 +1,10 @@
+// PR c++/51412
+// { dg-do compile { target c++11 } }
+
+void foo(int);
+
+template<int> void bar()
+{
+  foo([]{}...);      // { dg-error "<lambda>" }
+  foo([]{}=0 ...);   // { dg-error "<lambda>" }
+}