PR c++/35747

	* semantics.c (finish_stmt_expr): Call pop_stmt_list even if the stmt
	expression is errorneous.

	* g++.dg/ext/stmtexpr13.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134567 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1ea3733..71bb45e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/35747
+       * semantics.c (finish_stmt_expr): Call pop_stmt_list even if the stmt
+       expression is errorneous.
+
 2008-04-21  Jason Merrill  <jason@redhat.com>
 
        PR c++/35325

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 12cf387..f31235b 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1739,7 +1739,10 @@ finish_stmt_expr (tree stmt_expr, bool has_no_scope)
   tree result;
 
   if (error_operand_p (stmt_expr))
-    return error_mark_node;
+    {
+      pop_stmt_list (stmt_expr);
+      return error_mark_node;
+    }
 
   gcc_assert (TREE_CODE (stmt_expr) == STATEMENT_LIST);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index af0d320..cf689a4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/35747
+       * g++.dg/ext/stmtexpr13.C: New test.
+
 2008-04-22  Ian Lance Taylor  <iant@google.com>
 
        * gcc.c-torture/compile/20080419-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/ext/stmtexpr13.C b/gcc/testsuite/g++.dg/ext/stmtexpr13.C
new file mode 100644 (file)
index 0000000..978da15
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/stmtexpr13.C
@@ -0,0 +1,9 @@
+// PR c++/35747
+// { dg-do compile }
+// { dg-options "" }
+
+void
+foo ()
+{
+  ({ i; ({ i; }); 0; });       // { dg-error "was not declared" }
+}