From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 6 Mar 2009 23:52:02 +0000 (+0000)
Subject: re PR c++/33492 (Broken diagnostic: 'must_not_throw_expr' not supported by dump_expr)
X-Git-Tag: releases/gcc-4.4.0~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b4270d0c396bcb055ce42662c76a9db29f3c71;p=thirdparty%2Fgcc.git

re PR c++/33492 (Broken diagnostic: 'must_not_throw_expr' not supported by dump_expr)

/cp
2009-03-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/33492
	* error.c (dump_expr): Don't try to print THROW_EXPRs in full.

/testsuite
2009-03-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/33492
	* g++.dg/other/error32.C: New.

From-SVN: r144686
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 720663918d41..df07da5b8512 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/33492
+	* error.c (dump_expr): Don't try to print THROW_EXPRs in full.
+
 2009-03-06  Alexandre Oliva  <aoliva@redhat.com>
 
 	* decl.c (record_builtin_java_type): Use canonicalized integer
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e2cb8bf0ecc5..5eb8f28b4c99 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1508,8 +1508,9 @@ dump_expr (tree t, int flags)
       break;
 
     case THROW_EXPR:
-      pp_cxx_identifier (cxx_pp, "throw");
-      dump_expr (TREE_OPERAND (t, 0), flags);
+      /* While waiting for caret diagnostics, avoid printing
+	 __cxa_allocate_exception, __cxa_throw, and the like.  */
+      pp_cxx_identifier (cxx_pp, "<throw-expression>");
       break;
 
     case PTRMEM_CST:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c349894213c9..891bdb79a633 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-06  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/33492
+	* g++.dg/other/error32.C: New.
+
 2009-03-06  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/39360
diff --git a/gcc/testsuite/g++.dg/other/error32.C b/gcc/testsuite/g++.dg/other/error32.C
new file mode 100644
index 000000000000..35c64c4eab99
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error32.C
@@ -0,0 +1,8 @@
+// PR c++/33492
+// { dg-options "" }
+
+void foo()
+{
+  if (throw 0) // { dg-error "could not convert .\\<throw-expression\\>. to .bool." }
+    ;
+}