mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-01 06:29:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

class.c (make_class_data): Create vtable for abstract classes.

Browse Source 
2000-07-27  Tom Tromey  <tromey@cygnus.com>
            Anthony Green  <green@cygnus.com>
	    Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* class.c (make_class_data): Create vtable for abstract classes.
	(get_dispatch_table): Changed to cope with abstract classes.

Co-Authored-By: Alexandre Petit-Bianco <apbianco@cygnus.com>
Co-Authored-By: Anthony Green <green@cygnus.com>

From-SVN: r35313
This commit is contained in:
Tom Tromey 2000-07-28 06:57:31 +00:00 committed by Tom Tromey
parent acacca1023
commit 13107ec07c
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/java/ChangeLog
View File

@ -1,3 +1,10 @@
2000-07-27 Tom Tromey <tromey@cygnus.com>
Anthony Green <green@cygnus.com>
Alexandre Petit-Bianco <apbianco@cygnus.com>
* class.c (make_class_data): Create vtable for abstract classes.
(get_dispatch_table): Changed to cope with abstract classes.
2000-07-27 Tom Tromey <tromey@cygnus.com>
* parse.y (patch_method_invocation): Don't reverse the argument

21
gcc/java/class.c
View File

@ -1218,6 +1218,7 @@ static tree
get_dispatch_table (type, this_class_addr)
tree type, this_class_addr;
{
int abstract_p = CLASS_ABSTRACT (TYPE_NAME (type));
tree vtable = get_dispatch_vector (type);
int i;
tree list = NULL_TREE;
@ -1226,12 +1227,20 @@ get_dispatch_table (type, this_class_addr)
{
tree method = TREE_VEC_ELT (vtable, i);
if (METHOD_ABSTRACT (method))
warning_with_decl (method, "abstract method in non-abstract class");
if (DECL_RTL (method) == 0)
make_decl_rtl (method, NULL, 1);
{
if (! abstract_p)
warning_with_decl (method,
"abstract method in non-abstract class");
method = null_pointer_node;
}
else
{
if (DECL_RTL (method) == 0)
make_decl_rtl (method, NULL, 1);
method = build1 (ADDR_EXPR, nativecode_ptr_type_node, method);
}
list = tree_cons (NULL_TREE /*DECL_VINDEX (method) + 2*/,
build1 (ADDR_EXPR, nativecode_ptr_type_node, method),
list);
method, list);
}
/* Dummy entry for compatibility with G++ -fvtable-thunks. When
using the Boehm GC we sometimes stash a GC type descriptor
@ -1345,7 +1354,7 @@ make_class_data (type)
rest_of_decl_compilation (methods_decl, (char*) 0, 1, 0);
if (assume_compiled (IDENTIFIER_POINTER (DECL_NAME (type_decl)))
&& ! CLASS_ABSTRACT (type_decl) && ! CLASS_INTERFACE (type_decl))
&& ! CLASS_INTERFACE (type_decl))
{
tree dtable = get_dispatch_table (type, this_class_addr);
dtable_decl = build_dtable_decl (type);