X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fobjc-lang.c;h=c423d575db805135c41763a6ffe3b1cf09f07a63;hb=5018ce90c1205d79f29adf954b0fd5e613d08430;hp=fbf0dab2ae233b83ed3769f4320b289309ec4126;hpb=791b7405f4627ad65fd636d57adb9e5749d0b9e7;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index fbf0dab2ae..c423d575db 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1,6 +1,6 @@
 /* Objective-C language support routines for GDB, the GNU debugger.
 
-   Copyright (C) 2002-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
    Written by Michael Snyder.
@@ -401,7 +401,6 @@ extern const struct language_defn objc_language_defn = {
   c_language_arch_info,
   default_print_array_index,
   default_pass_by_reference,
-  default_get_string,
   c_watch_location_expression,
   NULL,				/* la_get_symbol_name_matcher */
   iterate_over_symbols,
@@ -538,8 +537,8 @@ compare_selectors (const void *a, const void *b)
 {
   const char *aname, *bname;
 
-  aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
-  bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+  aname = (*(struct symbol **) a)->print_name ();
+  bname = (*(struct symbol **) b)->print_name ();
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_selectors(1)"));
 
@@ -611,7 +610,7 @@ info_selectors_command (const char *regexp, int from_tty)
       for (minimal_symbol *msymbol : objfile->msymbols ())
 	{
 	  QUIT;
-	  name = MSYMBOL_NATURAL_NAME (msymbol);
+	  name = msymbol->natural_name ();
 	  if (name
 	      && (name[0] == '-' || name[0] == '+')
 	      && name[1] == '[')		/* Got a method name.  */
@@ -624,7 +623,7 @@ info_selectors_command (const char *regexp, int from_tty)
 	      if (name == NULL)
 		{
 		  complaint (_("Bad method name '%s'"),
-			     MSYMBOL_NATURAL_NAME (msymbol));
+			     msymbol->natural_name ());
 		  continue;
 		}
 	      if (regexp == NULL || re_exec(++name) != 0)
@@ -651,7 +650,7 @@ info_selectors_command (const char *regexp, int from_tty)
 	  for (minimal_symbol *msymbol : objfile->msymbols ())
 	    {
 	      QUIT;
-	      name = MSYMBOL_NATURAL_NAME (msymbol);
+	      name = msymbol->natural_name ();
 	      if (name &&
 		  (name[0] == '-' || name[0] == '+') &&
 		  name[1] == '[')		/* Got a method name.  */
@@ -676,7 +675,7 @@ info_selectors_command (const char *regexp, int from_tty)
 	  char *p = asel;
 
 	  QUIT;
-	  name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+	  name = sym_arr[ix]->natural_name ();
 	  name = strchr (name, ' ') + 1;
 	  if (p[0] && specialcmp(name, p) == 0)
 	    continue;		/* Seen this one already (not unique).  */
@@ -707,8 +706,8 @@ compare_classes (const void *a, const void *b)
 {
   const char *aname, *bname;
 
-  aname = SYMBOL_PRINT_NAME (*(struct symbol **) a);
-  bname = SYMBOL_PRINT_NAME (*(struct symbol **) b);
+  aname = (*(struct symbol **) a)->print_name ();
+  bname = (*(struct symbol **) b)->print_name ();
   if (aname == NULL || bname == NULL)
     error (_("internal: compare_classes(1)"));
 
@@ -765,7 +764,7 @@ info_classes_command (const char *regexp, int from_tty)
       for (minimal_symbol *msymbol : objfile->msymbols ())
 	{
 	  QUIT;
-	  name = MSYMBOL_NATURAL_NAME (msymbol);
+	  name = msymbol->natural_name ();
 	  if (name &&
 	      (name[0] == '-' || name[0] == '+') &&
 	      name[1] == '[')			/* Got a method name.  */
@@ -792,7 +791,7 @@ info_classes_command (const char *regexp, int from_tty)
 	  for (minimal_symbol *msymbol : objfile->msymbols ())
 	    {
 	      QUIT;
-	      name = MSYMBOL_NATURAL_NAME (msymbol);
+	      name = msymbol->natural_name ();
 	      if (name &&
 		  (name[0] == '-' || name[0] == '+') &&
 		  name[1] == '[') /* Got a method name.  */
@@ -810,7 +809,7 @@ info_classes_command (const char *regexp, int from_tty)
 	  char *p = aclass;
 
 	  QUIT;
-	  name = SYMBOL_NATURAL_NAME (sym_arr[ix]);
+	  name = sym_arr[ix]->natural_name ();
 	  name += 2;
 	  if (p[0] && specialcmp(name, p) == 0)
 	    continue;	/* Seen this one already (not unique).  */
@@ -1015,7 +1014,7 @@ find_methods (char type, const char *theclass, const char *category,
 
 	  /* Check the symbol name first as this can be done entirely without
 	     sending any query to the target.  */
-	  symname = MSYMBOL_NATURAL_NAME (msymbol);
+	  symname = msymbol->natural_name ();
 	  if (symname == NULL)
 	    continue;
 
@@ -1146,14 +1145,14 @@ find_imps (const char *method, std::vector<const char *> *symbol_names)
 					  0).symbol;
 
       if (sym != NULL) 
-	symbol_names->push_back (SYMBOL_NATURAL_NAME (sym));
+	symbol_names->push_back (sym->natural_name ());
       else
 	{
 	  struct bound_minimal_symbol msym
 	    = lookup_minimal_symbol (selector, 0, 0);
 
 	  if (msym.minsym != NULL) 
-	    symbol_names->push_back (MSYMBOL_NATURAL_NAME (msym.minsym));
+	    symbol_names->push_back (msym.minsym->natural_name ());
 	}
     }