From 7e278bae4f763445abe8b6c79ae684d7915eb939 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 30 Jan 2003 17:15:36 +0000 Subject: [PATCH] jcf-parse.c (read_class): Update identifier's class value if it changed during parsing. * jcf-parse.c (read_class): Update identifier's class value if it changed during parsing. From-SVN: r62149 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-parse.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3b56a3a30ed..4afcc943432 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2003-01-30 Tom Tromey + + * jcf-parse.c (read_class): Update identifier's class value if it + changed during parsing. + 2003-01-30 Loren James Rittle * Make-lang.in (po-generated): Find the targets in $(parsedir). diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 2f03202d5dd..20dc3ff9208 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -516,6 +516,10 @@ read_class (tree name) read_zip_member(current_jcf, current_jcf->zipd, current_jcf->zipd->zipf); jcf_parse (current_jcf); + /* Parsing might change the class, in which case we have to + put it back where we found it. */ + if (current_class != class && icv != NULL_TREE) + TREE_TYPE (icv) = current_class; class = current_class; java_pop_parser_context (0); java_parser_context_restore_global (); -- 2.30.2