From 352b3f3f2a32c75d2a615d4867ec0dcacced4ce6 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Tue, 8 May 2001 01:11:26 -0700 Subject: [PATCH] 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 * 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 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/parse.y | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fc09afd7872..01f513bc44c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-05-07 Alexandre Petit-Bianco + + * 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 * parse.y (fix_constructors): Removed unecessary assignment to diff --git a/gcc/java/parse.y b/gcc/java/parse.y index aaff8b4fd71..9985c736e01 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 -- 2.30.2