parse.y (find_most_specific_methods_list): Select the only non-abstract method even...

2000-07-18  Bryce McKinlay  <bryce@albatross.co.nz>

	* parse.y (find_most_specific_methods_list): Select the only
	non-abstract method even if max has been set.
	Fixes gcj/285, gcj/298.

(http://gcc.gnu.org/ml/gcc-patches/2000-10/msg00646.html)

From-SVN: r36956

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 191b20930e865e3fd0b7f373e32ea7ea447523d2..29e8a5382841c7ea5f7c0ebaa9ab286b5121fe12 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -685,6 +685,12 @@ Sun Aug  6 00:47:24 2000  Ovidiu Predescu  <ovidiu@cup.hp.com>
        (resolve_type_during_patch): Use `type' as a second
        argument to resolve_no_layout. Fixes gcj/257.
 
+2000-07-18  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * parse.y (find_most_specific_methods_list): Select the only 
+       non-abstract method even if max has been set.
+       Fixes gcj/285, gcj/298.
+
 2000-07-18  Jeff Sturm  <jeff.sturm@appnet.com>
 
        * lang-specs.h: Added %(jc1) to java compiler options.

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 15426246734bb05ed516eb20340548c943d43ff0..6dc13ea50fa0638dcac185c4b3e9303d4be0ed67 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -10600,9 +10600,9 @@ find_most_specific_methods_list (list)
       TREE_CHAIN (new_list) = NULL_TREE;
     }
 
-  /* We have several, we couldn't find a most specific, all but one are
-     abstract, we pick the only non abstract one. */
-  if (candidates > 0 && !max && (candidates == abstract+1))
+  /* We have several (we couldn't find a most specific), all but one
+     are abstract, we pick the only non abstract one. */
+  if (candidates > 0 && (candidates == abstract+1))
     {
       for (current = new_list; current; current = TREE_CHAIN (current))
        if (!METHOD_ABSTRACT (TREE_VALUE (current)))