gdb: Remove an update of current_source_line and current_source_symtab

While reviewing some of the annotation code I noticed that
identify_source_line (in source.c) sets current_source_line,
current_source_symtab, and also calls clear_lines_listed_range.  This
seems a little strange, identify_source_line is really a wrapper
around annotate_source, and is only called when annotation_level is
greater than 0 (so annotations are turned on).

It seems weird (to me) that when annotations are on we update GDB's
idea of the "current" line/symtab, but when they are off we don't,
given that annotations are really about communicating GDB's state to a
user (GUI) and surely shouldn't be changing GDB's behaviour.

This commit removes from identify_source_line all of the setting of
current line/symtab and the call to clear_lines_listed_range, after
doing this GDB still passes all tests, so I don't believe these lines
were actually required.

With this code removed identify_source_line is only a wrapper around
annotate_source, so I moved identify_source_line to annotate.c and
renamed it to annotate_source_line.

gdb/ChangeLog:

	* annotate.c: Add 'source.h' and 'objfiles.h' includes.
	(annotate_source): Make static.
	(annotate_source_line): Moved from source.c and renamed from
	identify_source_line.  Update the return type.
	* annotate.h (annotate_source): Delete declaration.
	(annotate_source_line): Declaration moved from source.h, and
	renamed from identify_source_line.  Return type updated.
	* source.c (identify_source_line): Moved to annotate.c and renamed
	to annotate_source_line.
	(info_line_command): Remove check of annotation_level.
	* source.h (identify_source_line): Move declaration to annotate.h
	and rename to annotate_source_line.
	* stack.c: Add 'annotate.h' include.
	(print_frame_info): Remove check of annotation_level before
	calling annotate_source_line.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb81983a1da6c465861122c39a9c251ff4391537..f0489df3a5c789c61d155e4f99dc8349bc9b63c8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,21 @@
+2019-06-15  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * annotate.c: Add 'source.h' and 'objfiles.h' includes.
+       (annotate_source): Make static.
+       (annotate_source_line): Moved from source.c and renamed from
+       identify_source_line.  Update the return type.
+       * annotate.h (annotate_source): Delete declaration.
+       (annotate_source_line): Declaration moved from source.h, and
+       renamed from identify_source_line.  Return type updated.
+       * source.c (identify_source_line): Moved to annotate.c and renamed
+       to annotate_source_line.
+       (info_line_command): Remove check of annotation_level.
+       * source.h (identify_source_line): Move declaration to annotate.h
+       and rename to annotate_source_line.
+       * stack.c: Add 'annotate.h' include.
+       (print_frame_info): Remove check of annotation_level before
+       calling annotate_source_line.
+
 2019-06-15  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * source-cache.c (source_cache::get_plain_source_lines): Use

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 84940ff031a7f001f089858406f9adc9f081e249..84f8129b22d0f0fbc94e0eda05eac5aeb270d12b 100644 (file)
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -26,6 +26,8 @@
 #include "inferior.h"
 #include "infrun.h"
 #include "top.h"
+#include "source.h"
+#include "objfiles.h"
 \f
 
 /* Prototypes for local functions.  */
@@ -417,7 +419,7 @@ annotate_arg_end (void)
     printf_filtered (("\n\032\032arg-end\n"));
 }
 
-void
+static void
 annotate_source (const char *filename, int line, int character, int mid,
                 struct gdbarch *gdbarch, CORE_ADDR pc)
 {
@@ -430,6 +432,31 @@ annotate_source (const char *filename, int line, int character, int mid,
                   mid ? "middle" : "beg", paddress (gdbarch, pc));
 }
 
+/* See annotate.h.  */
+
+bool
+annotate_source_line (struct symtab *s, int line, int mid_statement,
+                     CORE_ADDR pc)
+{
+  if (annotation_level > 0)
+    {
+      if (s->line_charpos == nullptr)
+       open_source_file_with_line_charpos (s);
+      if (s->fullname == nullptr)
+       return false;
+      /* Don't index off the end of the line_charpos array.  */
+      if (line > s->nlines)
+       return false;
+
+      annotate_source (s->fullname, line, s->line_charpos[line - 1],
+                      mid_statement, get_objfile_arch (SYMTAB_OBJFILE (s)),
+                      pc);
+      return true;
+    }
+  return false;
+}
+
+
 void
 annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
 {

diff --git a/gdb/annotate.h b/gdb/annotate.h
index ff10d4594652a99681bf7916756e3d7f6ff22daf..9683b7e09ac4b5c43b1355d1981bc2b51aae6a15 100644 (file)
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -87,8 +87,17 @@ struct annotate_arg_emitter
   DISABLE_COPY_AND_ASSIGN (annotate_arg_emitter);
 };
 
-extern void annotate_source (const char *, int, int, int,
-                            struct gdbarch *, CORE_ADDR);
+/* If annotations are turned on then print annotation describing the full
+   name of the source file S and the line number LINE and its corresponding
+   character position.
+
+   MID_STATEMENT is nonzero if the PC is not at the beginning of that
+   line.
+
+   Return true if successful, false if the file could not be found or
+   annotations are turned off.  */
+extern bool annotate_source_line (struct symtab *s, int line,
+                                 int mid_statement, CORE_ADDR pc);
 
 extern void annotate_frame_begin (int, struct gdbarch *, CORE_ADDR);
 extern void annotate_function_call (void);

diff --git a/gdb/source.c b/gdb/source.c
index dae1801c1369c6950b115d0914efaed08ffb1004..dec5a2f84bab5490c19a66b11f1e8bc0d1867457 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1212,29 +1212,6 @@ open_source_file_with_line_charpos (struct symtab *s)
 
 \f
 
-/* See source.h.  */
-
-int
-identify_source_line (struct symtab *s, int line, int mid_statement,
-                     CORE_ADDR pc)
-{
-  if (s->line_charpos == nullptr)
-    open_source_file_with_line_charpos (s);
-  if (s->fullname == 0)
-    return 0;
-  if (line > s->nlines)
-    /* Don't index off the end of the line_charpos array.  */
-    return 0;
-  annotate_source (s->fullname, line, s->line_charpos[line - 1],
-                  mid_statement, get_objfile_arch (SYMTAB_OBJFILE (s)), pc);
-
-  current_source_line = line;
-  current_source_symtab = s;
-  clear_lines_listed_range ();
-  return 1;
-}
-\f
-
 /* Print source lines from the file of symtab S,
    starting with line number LINE and stopping before line number STOPLINE.  */
 
@@ -1519,8 +1496,8 @@ info_line_command (const char *arg, int from_tty)
 
          /* If this is the only line, show the source code.  If it could
             not find the file, don't do anything special.  */
-         if (annotation_level && sals.size () == 1)
-           identify_source_line (sal.symtab, sal.line, 0, start_pc);
+         if (sals.size () == 1)
+           annotate_source_line (sal.symtab, sal.line, 0, start_pc);
        }
       else
        /* Is there any case in which we get here, and have an address

diff --git a/gdb/source.h b/gdb/source.h
index 7ea826acae5a01b265c0e9292c24e506ff4ac247..1c45405774b830f673fc1703442cb42962a9ca5c 100644 (file)
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -127,17 +127,6 @@ extern void clear_current_source_symtab_and_line (void);
 /* Add a source path substitution rule.  */
 extern void add_substitute_path_rule (char *, char *);
 
-/* Print text describing the full name of the source file S
-   and the line number LINE and its corresponding character position.
-   The text starts with two Ctrl-z so that the Emacs-GDB interface
-   can easily find it.
-
-   MID_STATEMENT is nonzero if the PC is not at the beginning of that line.
-
-   Return 1 if successful, 0 if could not find the file.  */
-extern int identify_source_line (struct symtab *s, int line,
-                                int mid_statement, CORE_ADDR pc);
-
 /* Flags passed as 4th argument to print_source_lines.  */
 enum print_source_lines_flag
   {

diff --git a/gdb/stack.c b/gdb/stack.c
index 547e82bbfb2469c349794f633ba5a1b7dcacb819..f471efe3df78ddc5f7d10f41f2c054b1eb53a8c8 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -47,6 +47,7 @@
 #include "linespec.h"
 #include "cli/cli-utils.h"
 #include "objfiles.h"
+#include "annotate.h"
 
 #include "symfile.h"
 #include "extension.h"
@@ -962,13 +963,11 @@ print_frame_info (const frame_print_options &fp_opts,
 
   if (source_print && sal.symtab)
     {
-      int done = 0;
       int mid_statement = ((print_what == SRC_LINE)
                           && frame_show_address (frame, sal));
+      bool done = annotate_source_line (sal.symtab, sal.line, mid_statement,
+                                       get_frame_pc (frame));
 
-      if (annotation_level)
-       done = identify_source_line (sal.symtab, sal.line, mid_statement,
-                                    get_frame_pc (frame));
       if (!done)
        {
          if (deprecated_print_frame_info_listing_hook)