[PATCH 4/9] gdb: Refactor 'find_symbol_funname' and 'info_frame_command_core' in stack.c.

[Christina Schimpe <christina.schimpe@intel.com>]

To avoid code duplication, create a new function 'stack.c:find_symbol_funname',
which will be used in 'stack.c:find_frame_funname' and
'stack.c:info_frame_command_core'.
The function will also be used in a following commit.
---
 gdb/stack.c | 72 ++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/gdb/stack.c b/gdb/stack.c
index 1c84b17bc14..91ae4046ad6 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1267,6 +1267,33 @@ get_last_displayed_sal ()
   return sal;
 }
 
+/* Find the function name for the symbol SYM.  */
+
+static gdb::unique_xmalloc_ptr<char>
+find_symbol_funname (const symbol *sym)
+{
+  gdb::unique_xmalloc_ptr<char> funname;
+  const char *print_name = sym->print_name ();
+
+  if (sym->language () == language_cplus)
+    {
+      /* It seems appropriate to use print_name () here,
+	 to display the demangled name that we already have
+	 stored in the symbol table, but we stored a version
+	 with DMGL_PARAMS turned on, and here we don't want to
+	 display parameters.  So remove the parameters.  */
+      funname = cp_remove_params (print_name);
+    }
+
+  if (funname == nullptr)
+    {
+      /* If we didn't hit the C++ case above, set *funname here.  */
+      funname.reset (xstrdup (print_name));
+    }
+
+  return funname;
+}
+
 
 /* Attempt to obtain the name, FUNLANG and optionally FUNCP of the function
    corresponding to FRAME.  */
@@ -1285,25 +1312,10 @@ find_frame_funname (const frame_info_ptr &frame, enum language *funlang,
   func = get_frame_function (frame);
   if (func)
     {
-      const char *print_name = func->print_name ();
-
       *funlang = func->language ();
       if (funcp)
 	*funcp = func;
-      if (*funlang == language_cplus)
-	{
-	  /* It seems appropriate to use print_name() here,
-	     to display the demangled name that we already have
-	     stored in the symbol table, but we stored a version
-	     with DMGL_PARAMS turned on, and here we don't want to
-	     display parameters.  So remove the parameters.  */
-	  funname = cp_remove_params (print_name);
-	}
-
-      /* If we didn't hit the C++ case above, set *funname
-	 here.  */
-      if (funname == NULL)
-	funname.reset (xstrdup (print_name));
+      funname = find_symbol_funname (func);
     }
   else
     {
@@ -1509,8 +1521,7 @@ info_frame_command_core (const frame_info_ptr &fi, bool selected_frame_p)
   struct symtab *s;
   frame_info_ptr calling_frame_info;
   int numregs;
-  const char *funname = 0;
-  enum language funlang = language_unknown;
+  gdb::unique_xmalloc_ptr<char> funname;
   const char *pc_regname;
   struct gdbarch *gdbarch;
   std::optional<CORE_ADDR> frame_pc;
@@ -1538,32 +1549,13 @@ info_frame_command_core (const frame_info_ptr &fi, bool selected_frame_p)
   func = get_frame_function (fi);
   symtab_and_line sal = find_frame_sal (fi);
   s = sal.symtab;
-  gdb::unique_xmalloc_ptr<char> func_only;
   if (func)
-    {
-      funname = func->print_name ();
-      funlang = func->language ();
-      if (funlang == language_cplus)
-	{
-	  /* It seems appropriate to use print_name() here,
-	     to display the demangled name that we already have
-	     stored in the symbol table, but we stored a version
-	     with DMGL_PARAMS turned on, and here we don't want to
-	     display parameters.  So remove the parameters.  */
-	  func_only = cp_remove_params (funname);
-
-	  if (func_only)
-	    funname = func_only.get ();
-	}
-    }
+    funname = find_symbol_funname (func);
   else if (frame_pc.has_value ())
     {
       bound_minimal_symbol msymbol = lookup_minimal_symbol_by_pc (*frame_pc);
       if (msymbol.minsym != NULL)
-	{
-	  funname = msymbol.minsym->print_name ();
-	  funlang = msymbol.minsym->language ();
-	}
+	funname.reset (xstrdup (msymbol.minsym->print_name ()));
     }
   calling_frame_info = get_prev_frame (fi);
 
@@ -1588,7 +1580,7 @@ info_frame_command_core (const frame_info_ptr &fi, bool selected_frame_p)
   if (funname)
     {
       gdb_printf (" in ");
-      gdb_puts (funname);
+      gdb_puts (funname.get ());
     }
   gdb_stdout->wrap_here (3);
   if (sal.symtab)
-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928