[binutils-gdb] Garbage collect TYPE_STATIC and several TYPE_FN_FIELD_x

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4da3eb35ef0545aac35dbd09070e5bf925f947d3

commit 4da3eb35ef0545aac35dbd09070e5bf925f947d3
Author: Pedro Alves <palves@redhat.com>
Date:   Tue Jul 4 18:40:26 2017 +0100

    Garbage collect TYPE_STATIC and several TYPE_FN_FIELD_x
    
    Nothing uses these.  Most of the TYPE_FN_FIELD_ ones were probably
    used by the gcj support.
    
    gdb/ChangeLog:
    2017-07-04  Pedro Alves  <palves@redhat.com>
    
    	* gdbtypes.c (recursive_dump_type): Don't reference TYPE_STATIC.
    	* gdbtypes.h (TYPE_STATIC): Delete.
    	(struct fn_field) <is_public, is_abstract, is_static, is_final,
    	is_synchronized, is_native>: Delete.
    	<dummy>: 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.

Diff:
---
 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  <palves@redhat.com>
+
+	* gdbtypes.c (recursive_dump_type): Don't reference TYPE_STATIC.
+	* gdbtypes.h (TYPE_STATIC): Delete.
+	(struct fn_field) <is_public, is_abstract, is_static, is_final,
+	is_synchronized, is_native>: Delete.
+	<dummy>: 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  <simon.marchi@ericsson.com>
 
 	* 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)