From 82db7dfda08131dae52e6379be6aacb6607beb5c Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 30 Oct 1998 00:35:32 +0000 Subject: [PATCH] * class.c (make_class_data): Renamed fields: nmethods to method_count, method_count to dtable_method_count. Always set `state' field to 0. * decl.c (init_decl_processing): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23449 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/class.c | 8 +++----- gcc/java/decl.c | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2f4383ed21c..3ebdedc18d7 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +1998-10-30 Tom Tromey + + * class.c (make_class_data): Renamed fields: nmethods to + method_count, method_count to dtable_method_count. Always set + `state' field to 0. + * decl.c (init_decl_processing): Likewise. + Wed Oct 28 08:03:31 1998 Alexandre Petit-Bianco * class.c (layout_class): Don't mangle , produce diff --git a/gcc/java/class.c b/gcc/java/class.c index 4a382b99506..d0fb94b2624 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1089,8 +1089,8 @@ make_class_data (type) PUSH_FIELD_VALUE (cons, "constants", constant_pool_constructor); PUSH_FIELD_VALUE (cons, "methods", build1 (ADDR_EXPR, method_ptr_type_node, methods_decl)); - PUSH_FIELD_VALUE (cons, "nmethods", build_int_2 (method_count, 0)); - PUSH_FIELD_VALUE (cons, "method_count", TYPE_NVIRTUALS (type)); + PUSH_FIELD_VALUE (cons, "method_count", build_int_2 (method_count, 0)); + PUSH_FIELD_VALUE (cons, "dtable_method_count", TYPE_NVIRTUALS (type)); PUSH_FIELD_VALUE (cons, "fields", fields_decl == NULL_TREE ? null_pointer_node : build1 (ADDR_EXPR, field_ptr_type_node, fields_decl)); @@ -1105,9 +1105,7 @@ make_class_data (type) PUSH_FIELD_VALUE (cons, "interfaces", interfaces); PUSH_FIELD_VALUE (cons, "loader", null_pointer_node); PUSH_FIELD_VALUE (cons, "interface_count", build_int_2 (interface_len, 0)); - PUSH_FIELD_VALUE (cons, "state", - flag_assume_compiled ? integer_four_node - : integer_two_node); + PUSH_FIELD_VALUE (cons, "state", integer_zero_node); PUSH_FIELD_VALUE (cons, "thread", null_pointer_node); diff --git a/gcc/java/decl.c b/gcc/java/decl.c index a49f22b31fd..6c44d15efb0 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -589,8 +589,8 @@ init_decl_processing () PUSH_FIELD (class_type_node, field, "superclass", class_ptr_type); PUSH_FIELD (class_type_node, field, "constants", constants_type_node); PUSH_FIELD (class_type_node, field, "methods", method_ptr_type_node); - PUSH_FIELD (class_type_node, field, "nmethods", short_type_node); PUSH_FIELD (class_type_node, field, "method_count", short_type_node); + PUSH_FIELD (class_type_node, field, "dtable_method_count", short_type_node); PUSH_FIELD (class_type_node, field, "fields", field_ptr_type_node); PUSH_FIELD (class_type_node, field, "size_in_bytes", int_type_node); PUSH_FIELD (class_type_node, field, "field_count", short_type_node); -- 2.11.4.GIT