aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/parse.y7
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1ef902c..f67cea3 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-08 Andrew Haley <aph@redhat.com>
+
+ * parse.y (attach_init_test_initialization_flags): Check for
+ error_mark_node.
+
2002-10-07 Anthony Green <green@redhat.com>
* parse.y (merge_string_cste): Fix bug in string concatenation.
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index bb7155b..ff4ef2c 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -16221,8 +16221,11 @@ attach_init_test_initialization_flags (entry, ptr)
tree block = (tree)ptr;
struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry;
- TREE_CHAIN (ite->value) = BLOCK_EXPR_DECLS (block);
- BLOCK_EXPR_DECLS (block) = ite->value;
+ if (block != error_mark_node)
+ {
+ TREE_CHAIN (ite->value) = BLOCK_EXPR_DECLS (block);
+ BLOCK_EXPR_DECLS (block) = ite->value;
+ }
return true;
}