From: Richard Sandiford <richard@codesourcery.com>
Date: Mon, 8 Aug 2005 07:42:37 +0000 (+0000)
Subject: re PR c/22458 (ICE on missing brace)
X-Git-Tag: releases/gcc-3.4.5~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5038c504df9b37c73d052f9b15a096a57b0e845f;p=thirdparty%2Fgcc.git

re PR c/22458 (ICE on missing brace)

	PR c/22458
	* c-decl.c (c_begin_compound_stmt): Set the initial body to
	error_mark_node, not NULL.

From-SVN: r102849
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ffe4e37ff60..b827fc16ce5b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Richard Sandiford  <richard@codesourcery.com>
+
+	PR c/22458
+	* c-decl.c (c_begin_compound_stmt): Set the initial body to
+	error_mark_node, not NULL.
+
 2005-08-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* pa64-regs.h (CONDITIONAL_REGISTER_USAGE): Fix loop upper bound.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 4eca4f26dc7e..38166cc94f39 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -6410,7 +6410,7 @@ c_begin_compound_stmt (void)
   tree stmt;
 
   /* Create the COMPOUND_STMT.  */
-  stmt = add_stmt (build_stmt (COMPOUND_STMT, NULL_TREE));
+  stmt = add_stmt (build_stmt (COMPOUND_STMT, error_mark_node));
 
   return stmt;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c86d9e54fa33..fb6e40544373 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Richard Sandiford  <richard@codesourcery.com>
+
+	PR c/22458
+	* gcc.dg/pr22458-1.c: New test.
+
 2005-08-03  Richard Sandiford  <richard@codesourcery.com>
 
 	PR target/18582
diff --git a/gcc/testsuite/gcc.dg/pr22458-1.c b/gcc/testsuite/gcc.dg/pr22458-1.c
index 8b8032c410a6..138bdd825798 100644
--- a/gcc/testsuite/gcc.dg/pr22458-1.c
+++ b/gcc/testsuite/gcc.dg/pr22458-1.c
@@ -1,4 +1,4 @@
-/* { dg-error "expected declaration or statement" "" { target *-*-* } 0 } */
+/* { dg-error "(parse|syntax) error" "" { target *-*-* } 0 } */
 void foo()
 {
      __PRETTY_FUNCTION__;