aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-parser.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr20245-1.c5
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 283128a..db53428 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-28 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/20245
+ * c-parser.c (c_parser_compound_statement): Return error_mark_node
+ instead of NULL_TREE on error.
+
2005-02-28 David Edelsohn <edelsohn@gnu.org>
* config/rs6000/rs6000.c (EASY_VECTOR_15): Remove.
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index adebfd2..de6999a 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -3170,7 +3170,7 @@ c_parser_compound_statement (c_parser *parser)
{
tree stmt;
if (!c_parser_require (parser, CPP_OPEN_BRACE, "expected %<{%>"))
- return NULL_TREE;
+ return error_mark_node;
stmt = c_begin_compound_stmt (true);
c_parser_compound_statement_nostart (parser);
return c_end_compound_stmt (stmt, true);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9ed60b0..75fe532 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-28 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/20245
+ * gcc.dg/pr20245-1.c: New test.
+
2005-02-28 Jakub Jelinek <jakub@redhat.com>
PR middle-end/19874
diff --git a/gcc/testsuite/gcc.dg/pr20245-1.c b/gcc/testsuite/gcc.dg/pr20245-1.c
new file mode 100644
index 0000000..51089c6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr20245-1.c
@@ -0,0 +1,5 @@
+/* Bug 20245: the parse error should not result in an ICE. */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+void foo() x; /* { dg-error "expected" } */