From: Volker Reichelt <reichelt@netcologne.de>
Date: Wed, 2 Jan 2008 23:49:23 +0000 (+0000)
Subject: Backport:
X-Git-Tag: prereleases/gcc-4.2.3-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f5333e84ffc262b27680746c6fc2c753831dea;p=thirdparty%2Fgcc.git

Backport:

	2007-11-02  Paolo Carlini  <pcarlini@suse.de>

	PR c++/33495
	* error.c (dump_expr): Deal specially with statements.

	* g++.dg/other/error19.C: New.

From-SVN: r131268
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9d3332764227..90982f42dc51 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,11 @@
 2008-01-02  Volker Reichelt  <reichelt@netcologne.de>
 
 	Backport:
+	2007-11-02  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/33495
+	* error.c (dump_expr): Deal specially with statements.
+
 	2007-09-27  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/33493
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 8b8fabb87194..e495e430aed2 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1324,6 +1324,12 @@ dump_expr (tree t, int flags)
   if (t == 0)
     return;
 
+  if (STATEMENT_CLASS_P (t))
+    {
+      pp_cxx_identifier (cxx_pp, "<statement>");
+      return;
+    }
+
   switch (TREE_CODE (t))
     {
     case VAR_DECL:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 41c7159bedff..8354a6ea3cac 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2008-01-02  Volker Reichelt  <reichelt@netcologne.de>
 
 	Backport:
+	2007-11-02  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/33495
+	* g++.dg/other/error19.C: New.
+
 	2007-09-27  Paolo Carlini  <pcarlini@suse.de>
 
 	PR c++/33493
diff --git a/gcc/testsuite/g++.dg/other/error19.C b/gcc/testsuite/g++.dg/other/error19.C
new file mode 100644
index 000000000000..9389dc170002
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error19.C
@@ -0,0 +1,7 @@
+// PR c++/33495
+
+void foo()
+{
+  if (({while(true);})) // { dg-error "forbids|<statement>" }
+    ;
+}