diff options
| author | Alexandre Petit-Bianco <apbianco@redhat.com> | 2001-05-08 01:11:26 -0700 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2001-05-08 01:11:26 -0700 |
| commit | 352b3f3f2a32c75d2a615d4867ec0dcacced4ce6 (patch) | |
| tree | 1bf17abce5a87cfcecf9a04dbe7c66ed61cafacd /gcc/java | |
| parent | f9c00bbcb70e4e693c565a89c599866fc4c3e54e (diff) | |
| download | gcc-352b3f3f2a32c75d2a615d4867ec0dcacced4ce6.zip gcc-352b3f3f2a32c75d2a615d4867ec0dcacced4ce6.tar.gz gcc-352b3f3f2a32c75d2a615d4867ec0dcacced4ce6.tar.bz2 | |
re PR java/2538 (latest gcj no longer compiles apache xerces parser due problems with variable declarations and inner classes)
2001-05-07 Alexandre Petit-Bianco <apbianco@redhat.com>
* parse.y (build_unresolved_array_type): Set
EXPR_WFL_QUALIFICATION on the newly created wfl.
Fixes PR java/2538. Fixes PR java/2535.
(http://gcc.gnu.org/ml/gcc-patches/2001-05/msg00438.html )
From-SVN: r41917
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fc09afd..01f513b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,11 @@ 2001-05-07 Alexandre Petit-Bianco <apbianco@redhat.com> + * parse.y (build_unresolved_array_type): Set + EXPR_WFL_QUALIFICATION on the newly created wfl. + Fixes PR java/2538. Fixes PR java/2535. + +2001-05-07 Alexandre Petit-Bianco <apbianco@redhat.com> + * parse.y (fix_constructors): Removed unecessary assignment to local. Moved assignment to `this$<n>', fixed comments and indentation. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index aaff8b4..9985c73 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -3305,6 +3305,7 @@ build_unresolved_array_type (type_or_wfl) tree type_or_wfl; { const char *ptr; + tree wfl; /* TYPE_OR_WFL might be an array on a resolved type. In this case, just create a array type */ @@ -3316,10 +3317,14 @@ build_unresolved_array_type (type_or_wfl) IDENTIFIER_POINTER (EXPR_WFL_NODE (type_or_wfl)), IDENTIFIER_LENGTH (EXPR_WFL_NODE (type_or_wfl))); ptr = obstack_finish (&temporary_obstack); - return build_expr_wfl (get_identifier (ptr), - EXPR_WFL_FILENAME (type_or_wfl), - EXPR_WFL_LINENO (type_or_wfl), - EXPR_WFL_COLNO (type_or_wfl)); + wfl = build_expr_wfl (get_identifier (ptr), + EXPR_WFL_FILENAME (type_or_wfl), + EXPR_WFL_LINENO (type_or_wfl), + EXPR_WFL_COLNO (type_or_wfl)); + /* Re-install the existing qualifications so that the type can be + resolved properly. */ + EXPR_WFL_QUALIFICATION (wfl) = EXPR_WFL_QUALIFICATION (type_or_wfl); + return wfl; } static void |