For PR java/6425:

	* parse.y (qualify_ambiguous_name) [case CALL_EXPR]: Always choose
	EXPR_WFL_QUALIFICATION of qual_wfl.

From-SVN: r52751

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9e834457dd78dca0712fe52213ba959b99a1ebf0..d11cba1633d8c6600e8bc108173f8b1a9033fe04 100644 (file)
--- 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 b230abb250ead9c7d55a5076a41fe61824be143d..9ce17bf8a38d06b3f6c14a11d7008ca47328e7a2 100644 (file)
--- 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);