arm: Check UNDEFWEAK_NO_DYNAMIC_RELOC

[deliverable/binutils-gdb.git] / gdb / stack.c

diff --git a/gdb/stack.c b/gdb/stack.c
index f48fa1d884bbcaf83034565d378182afe822be14..4e40e3228325c3b0df60bb131cb384f143447626 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1032,16 +1032,16 @@ get_last_displayed_sal ()
 }
 
 
-/* Attempt to obtain the FUNNAME, FUNLANG and optionally FUNCP of the function
-   corresponding to FRAME.  FUNNAME needs to be freed by the caller.  */
+/* Attempt to obtain the name, FUNLANG and optionally FUNCP of the function
+   corresponding to FRAME.  */
 
-void
-find_frame_funname (struct frame_info *frame, char **funname,
-                   enum language *funlang, struct symbol **funcp)
+gdb::unique_xmalloc_ptr<char>
+find_frame_funname (struct frame_info *frame, enum language *funlang,
+                   struct symbol **funcp)
 {
   struct symbol *func;
+  gdb::unique_xmalloc_ptr<char> funname;
 
-  *funname = NULL;
   *funlang = language_unknown;
   if (funcp)
     *funcp = NULL;
@@ -1084,7 +1084,7 @@ find_frame_funname (struct frame_info *frame, char **funname,
          /* We also don't know anything about the function besides
             its address and name.  */
          func = 0;
-         *funname = xstrdup (MSYMBOL_PRINT_NAME (msymbol.minsym));
+         funname.reset (xstrdup (MSYMBOL_PRINT_NAME (msymbol.minsym)));
          *funlang = MSYMBOL_LANGUAGE (msymbol.minsym);
        }
       else
@@ -1101,17 +1101,13 @@ find_frame_funname (struct frame_info *frame, char **funname,
                 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.  */
-             char *func_only = cp_remove_params (print_name);
-
-             if (func_only)
-               *funname = func_only;
+             funname = cp_remove_params (print_name);
            }
 
-         /* If we didn't hit the C++ case above, set *funname here.
-            This approach is taken to avoid having to install a
-            cleanup in case cp_remove_params can throw.  */
-         if (*funname == NULL)
-           *funname = xstrdup (print_name);
+         /* If we didn't hit the C++ case above, set *funname
+            here.  */
+         if (funname == NULL)
+           funname.reset (xstrdup (print_name));
        }
     }
   else
@@ -1120,15 +1116,17 @@ find_frame_funname (struct frame_info *frame, char **funname,
       CORE_ADDR pc;
 
       if (!get_frame_address_in_block_if_available (frame, &pc))
-       return;
+       return funname;
 
       msymbol = lookup_minimal_symbol_by_pc (pc);
       if (msymbol.minsym != NULL)
        {
-         *funname = xstrdup (MSYMBOL_PRINT_NAME (msymbol.minsym));
+         funname.reset (xstrdup (MSYMBOL_PRINT_NAME (msymbol.minsym)));
          *funlang = MSYMBOL_LANGUAGE (msymbol.minsym);
        }
     }
+
+  return funname;
 }
 
 static void
@@ -1138,9 +1136,7 @@ print_frame (struct frame_info *frame, int print_level,
 {
   struct gdbarch *gdbarch = get_frame_arch (frame);
   struct ui_out *uiout = current_uiout;
-  char *funname = NULL;
   enum language funlang = language_unknown;
-  struct cleanup *old_chain;
   struct value_print_options opts;
   struct symbol *func;
   CORE_ADDR pc = 0;
@@ -1148,9 +1144,8 @@ print_frame (struct frame_info *frame, int print_level,
 
   pc_p = get_frame_pc_if_available (frame, &pc);
 
-
-  find_frame_funname (frame, &funname, &funlang, &func);
-  old_chain = make_cleanup (xfree, funname);
+  gdb::unique_xmalloc_ptr<char> funname
+    = find_frame_funname (frame, &funlang, &func);
 
   annotate_frame_begin (print_level ? frame_relative_level (frame) : 0,
                        gdbarch, pc);
@@ -1181,7 +1176,7 @@ print_frame (struct frame_info *frame, int print_level,
     annotate_frame_function_name ();
 
     string_file stb;
-    fprintf_symbol_filtered (&stb, funname ? funname : "??",
+    fprintf_symbol_filtered (&stb, funname ? funname.get () : "??",
                             funlang, DMGL_ANSI);
     uiout->field_stream ("func", stb);
     uiout->wrap_hint ("   ");
@@ -1257,7 +1252,6 @@ print_frame (struct frame_info *frame, int print_level,
   }
 
   uiout->text ("\n");
-  do_cleanups (old_chain);
 }
 \f
 
@@ -1280,8 +1274,6 @@ parse_frame_specification (const char *frame_exp, int *selected_frame_p)
       numargs = 0;
       while (1)
        {
-         char *addr_string;
-         struct cleanup *cleanup;
          const char *p;
 
          /* Skip leading white space, bail of EOL.  */
@@ -1293,9 +1285,8 @@ parse_frame_specification (const char *frame_exp, int *selected_frame_p)
          for (p = frame_exp;
               *p && !ISSPACE (*p);
               p++);
-         addr_string = savestring (frame_exp, p - frame_exp);
+         std::string addr_string (frame_exp, p - frame_exp);
          frame_exp = p;
-         cleanup = make_cleanup (xfree, addr_string);
          
          /* NOTE: Parse and evaluate expression, but do not use
             functions such as parse_and_eval_long or
@@ -1305,9 +1296,7 @@ parse_frame_specification (const char *frame_exp, int *selected_frame_p)
             side-effects.  */
          if (numargs >= ARRAY_SIZE (args))
            error (_("Too many args in frame specification"));
-         args[numargs++] = parse_and_eval (addr_string);
-
-         do_cleanups (cleanup);
+         args[numargs++] = parse_and_eval (addr_string.c_str ());
        }
     }
 
@@ -1403,7 +1392,6 @@ info_frame_command (char *addr_exp, int from_tty)
   const char *pc_regname;
   int selected_frame_p;
   struct gdbarch *gdbarch;
-  struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
   CORE_ADDR frame_pc;
   int frame_pc_p;
   /* Initialize it to avoid "may be used uninitialized" warning.  */
@@ -1431,6 +1419,7 @@ info_frame_command (char *addr_exp, int from_tty)
   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 = SYMBOL_PRINT_NAME (func);
@@ -1442,13 +1431,10 @@ info_frame_command (char *addr_exp, int from_tty)
             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.  */
-         char *func_only = cp_remove_params (funname);
+         func_only = cp_remove_params (funname);
 
          if (func_only)
-           {
-             funname = func_only;
-             make_cleanup (xfree, func_only);
-           }
+           funname = func_only.get ();
        }
     }
   else if (frame_pc_p)
@@ -1700,8 +1686,6 @@ info_frame_command (char *addr_exp, int from_tty)
     if (count || need_nl)
       puts_filtered ("\n");
   }
-
-  do_cleanups (back_to);
 }
 
 /* Print briefly all stack frames or just the innermost COUNT_EXP