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

re PR java/9695 (Inner class bug prevent GNU Classpath from compiling)

Browse Source 
PR java/9695:
	* class.c (maybe_layout_super_class): Always pass a WFL to
	do_resolve_class.
	* parse.y (do_resolve_class): Updated comment to explain
	parameters.

From-SVN: r63584
This commit is contained in:
Tom Tromey 2003-02-28 20:53:47 +00:00 committed by Tom Tromey
parent 8c108db21b
commit 0ea05c0da3
3 changed files with 25 additions and 6 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 @@
2003-02-28 Tom Tromey <tromey@redhat.com>
PR java/9695:
* class.c (maybe_layout_super_class): Always pass a WFL to
do_resolve_class.
* parse.y (do_resolve_class): Updated comment to explain
parameters.
2003-02-26 Tom Tromey <tromey@redhat.com>
* jcf-write.c (generate_classfile): Check whether class is

13
gcc/java/class.c
View File

@ -1726,8 +1726,19 @@ maybe_layout_super_class (tree super_class, tree this_class)
super_class = TREE_TYPE (super_class);
else
{
/* do_resolve_class expects an EXPR_WITH_FILE_LOCATION, so
we give it one. */
tree this_wrap = NULL_TREE;
if (this_class)
{
tree this_decl = TYPE_NAME (this_class);
this_wrap = build_expr_wfl (this_class,
DECL_SOURCE_FILE (this_decl),
DECL_SOURCE_LINE (this_decl), 0);
}
super_class = do_resolve_class (NULL_TREE, /* FIXME? */
super_class, NULL_TREE, this_class);
super_class, NULL_TREE, this_wrap);
if (!super_class)
return NULL_TREE; /* FIXME, NULL_TREE not checked by caller. */
super_class = TREE_TYPE (super_class);

10
gcc/java/parse.y
View File

@ -5678,11 +5678,11 @@ resolve_class (tree enclosing, tree class_type, tree decl, tree cl)
return resolved_type_decl;
}
/* Effectively perform the resolution of class CLASS_TYPE. DECL or CL
are used to report error messages. Do not try to replace TYPE_NAME
(class_type) by a variable, since it is changed by
find_in_imports{_on_demand} and (but it doesn't really matter)
qualify_and_find. */
/* Effectively perform the resolution of class CLASS_TYPE. DECL or CL
are used to report error messages; CL must either be NULL_TREE or a
WFL wrapping a class. Do not try to replace TYPE_NAME (class_type)
by a variable, since it is changed by find_in_imports{_on_demand}
and (but it doesn't really matter) qualify_and_find. */
tree
do_resolve_class (tree enclosing, tree class_type, tree decl, tree cl)