OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR java/23431 (gcj allows overriding with more restrictive access) 

PR java/23431
	* typeck.c (lookup_do): Look up interfaces for the original class,
	not the base class.
	* parse.y (java_check_regular_methods): Fix diagnostic message for
	more restrictive overriding of a method from an interface.

From-SVN: r103909
This commit is contained in:
Ranjit Mathew 2005-09-05 14:57:25 +00:00 committed by Ranjit Mathew
parent 7291645b6e
commit 75d1a48521
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/java/ChangeLog
View File

@ -1,3 +1,11 @@
2005-09-05 Ranjit Mathew <rmathew@hotmail.com>
PR java/23431
* typeck.c (lookup_do): Look up interfaces for the original class,
not the base class.
* parse.y (java_check_regular_methods): Fix diagnostic message for
more restrictive overriding of a method from an interface.
2005-08-16 Tom Tromey <tromey@redhat.com>
* class.c (make_class_data): Always emit JV_STATE_PRELOADING for

2
gcc/java/parse.y
View File

@ -6518,7 +6518,7 @@ java_check_regular_methods (tree class_decl)
tree found_decl = TYPE_NAME (DECL_CONTEXT (found));
parse_error_context (method_wfl, "Class %qs must override %qs with a public method in order to implement interface %qs",
IDENTIFIER_POINTER (DECL_NAME (class_decl)),
lang_printable_name (method, 2),
lang_printable_name (found, 0),
IDENTIFIER_POINTER (DECL_NAME (found_decl)));
}

3
gcc/java/typeck.c
View File

@ -842,6 +842,7 @@ lookup_do (tree searched_class, int flags, tree method_name,
tree signature, tree (*signature_builder) (tree))
{
tree method;
tree orig_class = searched_class;
if (searched_class == NULL_TREE)
return NULL_TREE;
@ -868,7 +869,7 @@ lookup_do (tree searched_class, int flags, tree method_name,
/* If that doesn't work, look in our interfaces. */
if (flags & SEARCH_INTERFACE)
method = find_method_in_interfaces (searched_class, flags, method_name,
method = find_method_in_interfaces (orig_class, flags, method_name,
signature, signature_builder);
return method;