remote: Fix indentation in remote_new_objfile.

[deliverable/binutils-gdb.git] / gdb / cp-support.c

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 11e54c272c57a2d55265d3213ef9dce54be3216f..5bd8fd4e9408afe7c6c6c0d47b1c5d865cbec3d7 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2002-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
 
@@ -735,8 +735,8 @@ cp_class_name_from_physname (const char *physname)
       case DEMANGLE_COMPONENT_RESTRICT_THIS:
       case DEMANGLE_COMPONENT_VOLATILE_THIS:
       case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
-        ret_comp = d_left (ret_comp);
-        break;
+       ret_comp = d_left (ret_comp);
+       break;
       default:
        done = 1;
        break;
@@ -763,8 +763,8 @@ cp_class_name_from_physname (const char *physname)
       case DEMANGLE_COMPONENT_QUAL_NAME:
       case DEMANGLE_COMPONENT_LOCAL_NAME:
        prev_comp = cur_comp;
-        cur_comp = d_right (cur_comp);
-        break;
+       cur_comp = d_right (cur_comp);
+       break;
       case DEMANGLE_COMPONENT_TEMPLATE:
       case DEMANGLE_COMPONENT_NAME:
       case DEMANGLE_COMPONENT_CTOR:
@@ -811,11 +811,11 @@ unqualified_name_from_comp (struct demangle_component *comp)
       {
       case DEMANGLE_COMPONENT_QUAL_NAME:
       case DEMANGLE_COMPONENT_LOCAL_NAME:
-        ret_comp = d_right (ret_comp);
-        break;
+       ret_comp = d_right (ret_comp);
+       break;
       case DEMANGLE_COMPONENT_TYPED_NAME:
-        ret_comp = d_left (ret_comp);
-        break;
+       ret_comp = d_left (ret_comp);
+       break;
       case DEMANGLE_COMPONENT_TEMPLATE:
        gdb_assert (last_template == NULL);
        last_template = ret_comp;
@@ -828,8 +828,8 @@ unqualified_name_from_comp (struct demangle_component *comp)
       case DEMANGLE_COMPONENT_RESTRICT_THIS:
       case DEMANGLE_COMPONENT_VOLATILE_THIS:
       case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
-        ret_comp = d_left (ret_comp);
-        break;
+       ret_comp = d_left (ret_comp);
+       break;
       case DEMANGLE_COMPONENT_NAME:
       case DEMANGLE_COMPONENT_CTOR:
       case DEMANGLE_COMPONENT_DTOR:
@@ -936,8 +936,8 @@ cp_remove_params_1 (const char *demangled_name, bool require_params)
       case DEMANGLE_COMPONENT_RESTRICT_THIS:
       case DEMANGLE_COMPONENT_VOLATILE_THIS:
       case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL:
-        ret_comp = d_left (ret_comp);
-        break;
+       ret_comp = d_left (ret_comp);
+       break;
       default:
        done = true;
        break;
@@ -1337,8 +1337,8 @@ add_symbol_overload_list_adl_namespace (struct type *type,
 
   while (type->code () == TYPE_CODE_PTR
         || TYPE_IS_REFERENCE (type)
-         || type->code () == TYPE_CODE_ARRAY
-         || type->code () == TYPE_CODE_TYPEDEF)
+        || type->code () == TYPE_CODE_ARRAY
+        || type->code () == TYPE_CODE_TYPEDEF)
     {
       if (type->code () == TYPE_CODE_TYPEDEF)
        type = check_typedef (type);
@@ -1415,12 +1415,12 @@ add_symbol_overload_list_using (const char *func_name,
        if (current->searched)
          continue;
 
-        /* If this is a namespace alias or imported declaration ignore
+       /* If this is a namespace alias or imported declaration ignore
           it.  */
-        if (current->alias != NULL || current->declaration != NULL)
-          continue;
+       if (current->alias != NULL || current->declaration != NULL)
+         continue;
 
-        if (strcmp (the_namespace, current->import_dest) == 0)
+       if (strcmp (the_namespace, current->import_dest) == 0)
          {
            /* Mark this import as searched so that the recursive call
               does not search it again.  */
@@ -1452,10 +1452,7 @@ add_symbol_overload_list_qualified (const char *func_name,
      matching FUNC_NAME.  Make sure we read that symbol table in.  */
 
   for (objfile *objf : current_program_space->objfiles ())
-    {
-      if (objf->sf)
-       objf->sf->qf->expand_symtabs_for_function (objf, func_name);
-    }
+    objf->expand_symtabs_for_function (func_name);
 
   /* Search upwards from currently selected frame (so that we can
      complete on local vars.  */
@@ -1615,11 +1612,10 @@ gdb_demangle (const char *name, int options)
   int crash_signal = 0;
 
 #ifdef HAVE_WORKING_FORK
-  scoped_restore restore_segv
-    = make_scoped_restore (&thread_local_segv_handler,
-                          catch_demangler_crashes
-                          ? gdb_demangle_signal_handler
-                          : nullptr);
+  scoped_segv_handler_restore restore_segv
+    (catch_demangler_crashes
+     ? gdb_demangle_signal_handler
+     : nullptr);
 
   bool core_dump_allowed = gdb_demangle_attempt_core_dump;
   SIGJMP_BUF jmp_buf;
@@ -1628,7 +1624,7 @@ gdb_demangle (const char *name, int options)
   if (catch_demangler_crashes)
     {
       /* The signal handler may keep the signal blocked when we longjmp out
-         of it.  If we have sigprocmask, we can use it to unblock the signal
+        of it.  If we have sigprocmask, we can use it to unblock the signal
         afterwards and we can avoid the performance overhead of saving the
         signal mask just in case the signal gets triggered.  Otherwise, just
         tell sigsetjmp to save the mask.  */
@@ -1647,7 +1643,7 @@ gdb_demangle (const char *name, int options)
   if (catch_demangler_crashes)
     {
       if (crash_signal != 0)
-        {
+       {
 #ifdef HAVE_SIGPROCMASK
          /* If we got the signal, SIGSEGV may still be blocked; restore it.  */
          sigset_t segv_sig_set;
@@ -1659,15 +1655,15 @@ gdb_demangle (const char *name, int options)
          /* If there was a failure, we can't report it here, because
             we might be in a background thread.  Instead, arrange for
             the reporting to happen on the main thread.  */
-          std::string copy = name;
-          run_on_main_thread ([=] ()
-            {
-              report_failed_demangle (copy.c_str (), core_dump_allowed,
-                                      crash_signal);
-            });
-
-          result = NULL;
-        }
+         std::string copy = name;
+         run_on_main_thread ([=] ()
+           {
+             report_failed_demangle (copy.c_str (), core_dump_allowed,
+                                     crash_signal);
+           });
+
+         result = NULL;
+       }
     }
 #endif
 
@@ -1676,15 +1672,6 @@ gdb_demangle (const char *name, int options)
 
 /* See cp-support.h.  */
 
-int
-gdb_sniff_from_mangled_name (const char *mangled, char **demangled)
-{
-  *demangled = gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI);
-  return *demangled != NULL;
-}
-
-/* See cp-support.h.  */
-
 unsigned int
 cp_search_name_hash (const char *search_name)
 {
@@ -2222,13 +2209,12 @@ void _initialize_cp_support ();
 void
 _initialize_cp_support ()
 {
-  add_basic_prefix_cmd ("cplus", class_maintenance,
-                       _("C++ maintenance commands."),
-                       &maint_cplus_cmd_list,
-                       "maintenance cplus ",
-                       0, &maintenancelist);
-  add_alias_cmd ("cp", "cplus",
-                class_maintenance, 1,
+  cmd_list_element *maintenance_cplus
+    = add_basic_prefix_cmd ("cplus", class_maintenance,
+                           _("C++ maintenance commands."),
+                           &maint_cplus_cmd_list,
+                           0, &maintenancelist);
+  add_alias_cmd ("cp", maintenance_cplus, class_maintenance, 1,
                 &maintenancelist);
 
   add_cmd ("first_component",