aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/parse.y4
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9e83445..d11cba1 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-24 Tom Tromey <tromey@redhat.com>
+
+ For PR java/6425:
+ * parse.y (qualify_ambiguous_name) [case CALL_EXPR]: Always choose
+ EXPR_WFL_QUALIFICATION of qual_wfl.
+
2002-04-23 Per Bothner <per@bothner.com>
* expr.c (PRE_JSR): Call NOTE_LABEL for return address.
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index b230abb..9ce17bf 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -11219,7 +11219,9 @@ qualify_ambiguous_name (id)
{
case CALL_EXPR:
qual_wfl = TREE_OPERAND (qual_wfl, 0);
- if (TREE_CODE (qual_wfl) != EXPR_WITH_FILE_LOCATION)
+ if (TREE_CODE (qual_wfl) != EXPR_WITH_FILE_LOCATION
+ || (EXPR_WFL_QUALIFICATION (qual_wfl)
+ && TREE_CODE (EXPR_WFL_QUALIFICATION (qual_wfl)) == TREE_LIST))
{
qual = EXPR_WFL_QUALIFICATION (qual_wfl);
qual_wfl = QUAL_WFL (qual);