diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-20 04:00:44 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-20 04:00:44 +0000 |
| commit | b185608a85e66325d1320c278b202a438913d3da (patch) | |
| tree | 2758ea9ec2b0934808400a4b57bdf7a73c61a2d1 /gcc | |
| parent | ee5b587b08017b607e981ac30751b81d9ec7e15e (diff) | |
| download | gcc-b185608a85e66325d1320c278b202a438913d3da.tar.gz | |
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)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36956 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 191b20930e8..29e8a538284 100644 --- 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 15426246734..6dc13ea50fa 100644 --- 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))) |