gdb: remove TYPE_PROTOTYPED

gdb/ChangeLog:

	* gdbtypes.h (TYPE_PROTOTYPED): Remove, replace all
	uses with type::is_prototyped.

Change-Id: Ic96b19c24ce5afcd7e1302a75c39909767e4d885

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 05cb60a3787583f34764f7a04383f719c8360e24..193d0c85e5f379ff4efc27ea096cf6b6e06b8f5b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-14  Simon Marchi  <simon.marchi@efficios.com>
+
+       * gdbtypes.h (TYPE_PROTOTYPED): Remove, replace all
+       uses with type::is_prototyped.
+
 2020-09-14  Simon Marchi  <simon.marchi@efficios.com>
 
        * gdbtypes.h (struct type) <is_prototyped, set_is_prototyped>:

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index ef16f2b83e1a4732bb953104a8a0766059d510df..37bb16e6daec0273ee9f8c6290a9ff8364f07828 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -604,7 +604,7 @@ c_type_print_args (struct type *type, struct ui_file *stream,
        }
     }
   else if (!printed_any
-          && (TYPE_PROTOTYPED (type) || language == language_cplus))
+          && (type->is_prototyped () || language == language_cplus))
     fprintf_filtered (stream, "void");
 
   fprintf_filtered (stream, ")");

diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 3527442e4eda2120e57988aa4e8318601ab8d8da..08c8c6b4a9a57d91fbac2d1051f614c26c017254 100644 (file)
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -153,7 +153,7 @@ convert_func (compile_c_instance *context, struct type *type)
   int i;
   gcc_type result, return_type;
   struct gcc_type_array array;
-  int is_varargs = TYPE_VARARGS (type) || !TYPE_PROTOTYPED (type);
+  int is_varargs = TYPE_VARARGS (type) || !type->is_prototyped ();
 
   struct type *target_type = TYPE_TARGET_TYPE (type);
 

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index c3a01673d2bc539a935dc2a62fbbe9876bf1fa7f..577ed3b9d2487ee18e532abb36aac4eb3f26a909 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -262,7 +262,7 @@ f_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
        if (passed_a_ptr)
          fprintf_filtered (stream, ") ");
        fprintf_filtered (stream, "(");
-       if (nfields == 0 && TYPE_PROTOTYPED (type))
+       if (nfields == 0 && type->is_prototyped ())
          f_print_type (builtin_f_type (get_type_arch (type))->builtin_void,
                        "", stream, -1, 0, 0);
        else

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 075363000b4fb8091717b7bd174cc8f3178233f9..ae3d92751b4c933b11078d9f133235694fe9c3d8 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -5084,7 +5084,7 @@ recursive_dump_type (struct type *type, int spaces)
     {
       puts_filtered (" TYPE_TARGET_STUB");
     }
-  if (TYPE_PROTOTYPED (type))
+  if (type->is_prototyped ())
     {
       puts_filtered (" TYPE_PROTOTYPED");
     }

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index b41e91f6ee6d2439d2e5b8fa156f7981a27b2b41..abb67467042e5909ae04a172c89aecb868c06ce1 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -216,13 +216,6 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
 
 #define TYPE_ENDIANITY_NOT_DEFAULT(t) (TYPE_MAIN_TYPE (t)->flag_endianity_not_default)
 
-/* * 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
-   is used with a short field.  */
-
-#define TYPE_PROTOTYPED(t)     ((t)->is_prototyped ())
-
 /* * FIXME drow/2002-06-03:  Only used for methods, but applies as well
    to functions.  */
 
@@ -1100,6 +1093,11 @@ struct type
     this->main_type->m_flag_target_stub = target_is_stub;
   }
 
+  /* 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
+     is used with a short field.  */
+
   bool is_prototyped () const
   {
     return this->main_type->m_flag_prototyped;

diff --git a/gdb/infcall.c b/gdb/infcall.c
index cdb30137c3585fcf6c102762af486e86b2098b80..a158cb5d085c774fb019a5f9b9b73d65f26f0f68 100644 (file)
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -1043,7 +1043,7 @@ call_function_by_hand_dummy (struct value *function,
          prototyped = 1;
        }
       else if (i < ftype->num_fields ())
-       prototyped = TYPE_PROTOTYPED (ftype);
+       prototyped = ftype->is_prototyped ();
       else
        prototyped = 0;
 

diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 1148eeae0e3ba61c4785bb4f2e4be7c39b3ded5c..04477945917baa029f55a564ea47a90125cbfd84 100644 (file)
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -795,7 +795,7 @@ rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
                    {
                      int p_arg_size = 4;
 
-                     if (TYPE_PROTOTYPED (func_type)
+                     if (func_type->is_prototyped ()
                          && i < func_type->num_fields ())
                        {
                          struct type *p_arg_type =