gdb/DWARF: Support for arrays whose bound is a discriminant.

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

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9b65f1afa00fbb417bb8de5fb38eb625fe891b36..9a1fb8d71307b698c56a525eb1267a38e833d978 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1,6 +1,6 @@
 /* Memory-access and commands for "inferior" process, for GDB.
 
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1202,7 +1202,7 @@ jump_command (char *arg, int from_tty)
       struct obj_section *section;
 
       fixup_symbol_section (sfn, 0);
-      section = SYMBOL_OBJ_SECTION (SYMBOL_OBJFILE (sfn), sfn);
+      section = SYMBOL_OBJ_SECTION (symbol_objfile (sfn), sfn);
       if (section_is_overlay (section)
          && !section_is_mapped (section))
        {
@@ -1872,7 +1872,14 @@ finish_command (char *arg, int from_tty)
       if (execution_direction == EXEC_REVERSE)
        printf_filtered (_("Run back to call of "));
       else
-       printf_filtered (_("Run till exit from "));
+       {
+         if (function != NULL && TYPE_NO_RETURN (function->type)
+             && !query (_("warning: Function %s does not return normally.\n"
+                          "Try to finish anyway? "),
+                        SYMBOL_PRINT_NAME (function)))
+           error (_("Not confirmed."));
+         printf_filtered (_("Run till exit from "));
+       }
 
       print_stack_frame (get_selected_frame (NULL), 1, LOCATION, 0);
     }