FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: remove TYPE_OBJFILE_OWNED macro

Browse source 
Update all users to use the type::is_objfile_owned method.

gdb/ChangeLog:

	* gdbtypes.h (TYPE_OBJFILE_OWNED): Remove, update all users to
	use the type::is_objfile_owned method.

Change-Id: Icae84d136393ab9f756f50a33ac3cedda13c5ba2
This commit is contained in:
Simon Marchi 2021-01-22 12:23:40 -05:00
parent 5b7d941b90
commit 3062502019
6 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2021-01-22 Simon Marchi <simon.marchi@polymtl.ca>
* gdbtypes.h (TYPE_OBJFILE_OWNED): Remove, update all users to
use the type::is_objfile_owned method.
2021-01-22 Simon Marchi <simon.marchi@efficios.com>
* gdbtypes.h (TYPE_OBJFILE_OWNED): Adjust.

4
gdb/compile/compile-c-types.c
View file

@ -164,7 +164,7 @@ convert_func (compile_c_instance *context, struct type *type)
GDB's parser used to do. */
if (target_type == NULL)
{
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
target_type = objfile_type (type->objfile ())->builtin_int;
else
target_type = builtin_type (type->arch ())->builtin_int;
@ -323,7 +323,7 @@ convert_type_basic (compile_c_instance *context, struct type *type)
built-in parser does. For now, assume "int" like GDB's
built-in parser used to do, but at least warn. */
struct type *fallback;
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
fallback = objfile_type (type->objfile ())->builtin_int;
else
fallback = builtin_type (type->arch ())->builtin_int;

2
gdb/compile/compile-cplus-types.c
View file

@ -970,7 +970,7 @@ compile_cplus_convert_func (compile_cplus_instance *instance,
GDB's parser used to do. */
if (target_type == nullptr)
{
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
target_type = objfile_type (type->objfile ())->builtin_int;
else
target_type = builtin_type (type->arch ())->builtin_int;

18
gdb/gdbtypes.c
View file

@ -226,7 +226,7 @@ alloc_type_arch (struct gdbarch *gdbarch)
struct type *
alloc_type_copy (const struct type *type)
{
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
return alloc_type (type->objfile ());
else
return alloc_type_arch (type->arch ());
@ -240,7 +240,7 @@ get_type_arch (const struct type *type)
{
struct gdbarch *arch;
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
arch = type->objfile ()->arch ();
else
arch = type->arch ();
@ -290,7 +290,7 @@ alloc_type_instance (struct type *oldtype)
/* Allocate the structure. */
if (! TYPE_OBJFILE_OWNED (oldtype))
if (!oldtype->is_objfile_owned ())
type = GDBARCH_OBSTACK_ZALLOC (get_type_arch (oldtype), struct type);
else
type = OBSTACK_ZALLOC (&TYPE_OBJFILE (oldtype)->objfile_obstack,
@ -1429,7 +1429,7 @@ lookup_array_range_type (struct type *element_type,
struct type *index_type;
struct type *range_type;
if (TYPE_OBJFILE_OWNED (element_type))
if (element_type->is_objfile_owned ())
index_type = objfile_type (element_type->objfile ())->builtin_int;
else
index_type = builtin_type (element_type->arch ())->builtin_int;
@ -2798,7 +2798,7 @@ type::add_dyn_prop (dynamic_prop_node_kind prop_kind, dynamic_prop prop)
{
struct dynamic_prop_list *temp;
gdb_assert (TYPE_OBJFILE_OWNED (this));
gdb_assert (this->is_objfile_owned ());
temp = XOBNEW (&TYPE_OBJFILE (this)->objfile_obstack,
struct dynamic_prop_list);
@ -5189,7 +5189,7 @@ recursive_dump_type (struct type *type, int spaces)
puts_filtered ("\n");
printf_filtered ("%*slength %s\n", spaces, "",
pulongest (TYPE_LENGTH (type)));
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
{
printf_filtered ("%*sobjfile ", spaces, "");
gdb_print_host_address (type->objfile (), gdb_stdout);
@ -5492,7 +5492,7 @@ copy_type_recursive (struct objfile *objfile,
void **slot;
struct type *new_type;
if (! TYPE_OBJFILE_OWNED (type))
if (!type->is_objfile_owned ())
return type;
/* This type shouldn't be pointing to any types in other objfiles;
@ -5658,7 +5658,7 @@ copy_type (const struct type *type)
{
struct type *new_type;
gdb_assert (TYPE_OBJFILE_OWNED (type));
gdb_assert (type->is_objfile_owned ());
new_type = alloc_type_copy (type);
new_type->set_instance_flags (type->instance_flags ());
@ -5960,7 +5960,7 @@ allocate_fixed_point_type_info (struct type *type)
std::unique_ptr<fixed_point_type_info> up (new fixed_point_type_info);
fixed_point_type_info *info;
if (TYPE_OBJFILE_OWNED (type))
if (type->is_objfile_owned ())
{
fixed_point_type_storage *storage
= fixed_point_objfile_key.get (TYPE_OBJFILE (type));

3
gdb/gdbtypes.h
View file

@ -224,7 +224,6 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
the objfile retrieved as TYPE_OBJFILE. Otherwise, the type is
owned by an architecture; TYPE_OBJFILE is NULL in this case. */
#define TYPE_OBJFILE_OWNED(t) ((t)->is_objfile_owned ())
#define TYPE_OBJFILE(t) ((t)->objfile ())
/* * True if this type was declared using the "class" keyword. This is
@ -2242,7 +2241,7 @@ extern const struct floatformat *floatformats_bfloat16[BFD_ENDIAN_UNKNOWN];
when it is no longer needed. */
#define TYPE_ALLOC(t,size) \
(obstack_alloc ((TYPE_OBJFILE_OWNED (t) \
(obstack_alloc (((t)->is_objfile_owned () \
? &((t)->objfile ()->objfile_obstack) \
: gdbarch_obstack ((t)->arch ())), \
size))

2
gdb/language.c
View file

@ -1036,7 +1036,7 @@ language_arch_info::type_and_symbol::alloc_type_symbol
{
struct symbol *symbol;
struct gdbarch *gdbarch;
gdb_assert (!TYPE_OBJFILE_OWNED (type));
gdb_assert (!type->is_objfile_owned ());
gdbarch = type->arch ();
symbol = new (gdbarch_obstack (gdbarch)) struct symbol ();
symbol->m_name = type->name ();