X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Flinespec.c;h=707a3a2586a2ce6d80e5d2f607119befacb78acd;hb=e05523bd2411bac0277da73556f4d01f6c7448aa;hp=7c403679455b8ad5f25966bacf132e85cb48cc92;hpb=32177d6e39a2ed82fdafd7c41456c311b64d09fc;p=binutils-gdb.git

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 7c403679455..707a3a2586a 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -3494,7 +3494,7 @@ decode_compound_collector::operator () (block_symbol *bsym)
   if (sym->aclass () != LOC_TYPEDEF)
     return true; /* Continue iterating.  */
 
-  t = SYMBOL_TYPE (sym);
+  t = sym->type ();
   t = check_typedef (t);
   if (t->code () != TYPE_CODE_STRUCT
       && t->code () != TYPE_CODE_UNION
@@ -3686,7 +3686,7 @@ find_method (struct linespec_state *self,
       pspace = symbol_symtab (sym)->pspace ();
       gdb_assert (!pspace->executing_startup);
       set_current_program_space (pspace);
-      t = check_typedef (SYMBOL_TYPE (sym));
+      t = check_typedef (sym->type ());
       find_methods (t, sym->language (),
 		    method_name, &result_names, &superclass_vec);
 
@@ -4273,8 +4273,7 @@ add_minsym (struct minimal_symbol *minsym, struct objfile *objfile,
   if (!list_mode && !msymbol_is_function (objfile, minsym))
     return;
 
-  struct bound_minimal_symbol mo = {minsym, objfile};
-  msyms->push_back (mo);
+  msyms->emplace_back (minsym, objfile);
   return;
 }
 
@@ -4451,7 +4450,7 @@ symbol_to_sal (struct symtab_and_line *result,
 	  *result = {};
 	  result->symtab = symbol_symtab (sym);
 	  result->symbol = sym;
-	  result->line = SYMBOL_LINE (sym);
+	  result->line = sym->line ();
 	  result->pc = SYMBOL_VALUE_ADDRESS (sym);
 	  result->pspace = result->symtab->pspace ();
 	  result->explicit_pc = 1;
@@ -4461,13 +4460,13 @@ symbol_to_sal (struct symtab_and_line *result,
 	{
 	  /* Nothing.  */
 	}
-      else if (SYMBOL_LINE (sym) != 0)
+      else if (sym->line () != 0)
 	{
 	  /* We know its line number.  */
 	  *result = {};
 	  result->symtab = symbol_symtab (sym);
 	  result->symbol = sym;
-	  result->line = SYMBOL_LINE (sym);
+	  result->line = sym->line ();
 	  result->pc = SYMBOL_VALUE_ADDRESS (sym);
 	  result->pspace = result->symtab->pspace ();
 	  return 1;