From patchwork Tue Jul 4 17:44:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 21408 Received: (qmail 74400 invoked by alias); 4 Jul 2017 17:44:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 74369 invoked by uid 89); 4 Jul 2017 17:44:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Jul 2017 17:44:05 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D401A61E48 for ; Tue, 4 Jul 2017 17:44:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D401A61E48 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D401A61E48 Received: from cascais.lan (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48DAD6887E for ; Tue, 4 Jul 2017 17:44:03 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [pushed] Garbage collect TYPE_STATIC and several TYPE_FN_FIELD_x Date: Tue, 4 Jul 2017 18:44:02 +0100 Message-Id: <1499190242-18808-1-git-send-email-palves@redhat.com> Nothing uses these. Most of the TYPE_FN_FIELD_ ones were probably used by the gcj support. gdb/ChangeLog: 2017-07-04 Pedro Alves * gdbtypes.c (recursive_dump_type): Don't reference TYPE_STATIC. * gdbtypes.h (TYPE_STATIC): Delete. (struct fn_field) : Delete. : Bump. (TYPE_FN_FIELD_PUBLIC, TYPE_FN_FIELD_STATIC, TYPE_FN_FIELD_FINAL) (TYPE_FN_FIELD_SYNCHRONIZED, TYPE_FN_FIELD_NATIVE) (TYPE_FN_FIELD_ABSTRACT): Delete. --- gdb/ChangeLog | 11 +++++++++++ gdb/gdbtypes.c | 4 ---- gdb/gdbtypes.h | 21 +-------------------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2451ba7..03f30af 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2017-07-04 Pedro Alves + + * gdbtypes.c (recursive_dump_type): Don't reference TYPE_STATIC. + * gdbtypes.h (TYPE_STATIC): Delete. + (struct fn_field) : Delete. + : Bump. + (TYPE_FN_FIELD_PUBLIC, TYPE_FN_FIELD_STATIC, TYPE_FN_FIELD_FINAL) + (TYPE_FN_FIELD_SYNCHRONIZED, TYPE_FN_FIELD_NATIVE) + (TYPE_FN_FIELD_ABSTRACT): Delete. + 2017-07-03 Simon Marchi * buffer.h (buffer_finish): Fix spelling mistakes. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index c9a9b3d..a686923 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4444,10 +4444,6 @@ recursive_dump_type (struct type *type, int spaces) { puts_filtered (" TYPE_TARGET_STUB"); } - if (TYPE_STATIC (type)) - { - puts_filtered (" TYPE_STATIC"); - } if (TYPE_PROTOTYPED (type)) { puts_filtered (" TYPE_PROTOTYPED"); diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 6f896db..d2018a8 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -221,13 +221,6 @@ enum type_instance_flag_value #define TYPE_TARGET_STUB(t) (TYPE_MAIN_TYPE (t)->flag_target_stub) -/* * Static type. If this is set, the corresponding type had - a static modifier. - Note: This may be unnecessary, since static data members - are indicated by other means (bitpos == -1). */ - -#define TYPE_STATIC(t) (TYPE_MAIN_TYPE (t)->flag_static) - /* * This is a function type which appears to have a prototype. We need this for function calls in order to tell us if it's necessary to coerce the args, or to just do the standard conversions. This @@ -844,12 +837,6 @@ struct fn_field unsigned int is_volatile:1; unsigned int is_private:1; unsigned int is_protected:1; - unsigned int is_public:1; - unsigned int is_abstract:1; - unsigned int is_static:1; - unsigned int is_final:1; - unsigned int is_synchronized:1; - unsigned int is_native:1; unsigned int is_artificial:1; /* * A stub method only has some fields valid (but they are enough @@ -863,7 +850,7 @@ struct fn_field /* * Unused. */ - unsigned int dummy:3; + unsigned int dummy:9; /* * Index into that baseclass's virtual function table, minus 2; else if static: VOFFSET_STATIC; else: 0. */ @@ -1405,13 +1392,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *); #define TYPE_FN_FIELD_VOLATILE(thisfn, n) ((thisfn)[n].is_volatile) #define TYPE_FN_FIELD_PRIVATE(thisfn, n) ((thisfn)[n].is_private) #define TYPE_FN_FIELD_PROTECTED(thisfn, n) ((thisfn)[n].is_protected) -#define TYPE_FN_FIELD_PUBLIC(thisfn, n) ((thisfn)[n].is_public) -#define TYPE_FN_FIELD_STATIC(thisfn, n) ((thisfn)[n].is_static) -#define TYPE_FN_FIELD_FINAL(thisfn, n) ((thisfn)[n].is_final) -#define TYPE_FN_FIELD_SYNCHRONIZED(thisfn, n) ((thisfn)[n].is_synchronized) -#define TYPE_FN_FIELD_NATIVE(thisfn, n) ((thisfn)[n].is_native) #define TYPE_FN_FIELD_ARTIFICIAL(thisfn, n) ((thisfn)[n].is_artificial) -#define TYPE_FN_FIELD_ABSTRACT(thisfn, n) ((thisfn)[n].is_abstract) #define TYPE_FN_FIELD_STUB(thisfn, n) ((thisfn)[n].is_stub) #define TYPE_FN_FIELD_CONSTRUCTOR(thisfn, n) ((thisfn)[n].is_constructor) #define TYPE_FN_FIELD_FCONTEXT(thisfn, n) ((thisfn)[n].fcontext)