Remove dwarf_decode_lines argumewant_line_info

Hi,
dwarf_decode_lines is called in two functions,
dwarf2_build_include_psymtabs and handle_DW_AT_stmt_list, in which, 1
is passed to argument 'want_line_info' and 'want_line_info' is a
conditional variable in dwarf_decode_lines.  We can simplify it by
removing 'want_line_info' and propagating the constant 1 into
dwarf_decode_lines.  This is what this patch does.  This patch also
remove one line comment about WANT_LINE_INFO in
handle_DW_AT_stmt_list, as handle_DW_AT_stmt_list doesn't have such
argument.

gdb:

2014-08-28  Yao Qi  <yao@codesourcery.com>

	* dwarf2read.c (dwarf_decode_lines): Update declaration.
	(handle_DW_AT_stmt_list): Remove comment about WANT_LINE_INFO.
	(dwarf_decode_lines): Remove argument
	want_line_info.  Remove condition check on want_line_info.
	Callers update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53c25ba0fc5cc731bef98b87bce2fcfcc979b924..c7ccb41fc39a2bd8642cccabd81e73b755a72b03 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-28  Yao Qi  <yao@codesourcery.com>
+
+       * dwarf2read.c (dwarf_decode_lines): Update declaration.
+       (handle_DW_AT_stmt_list): Remove comment about WANT_LINE_INFO.
+       (dwarf_decode_lines): Remove argument
+       want_line_info.  Remove condition check on want_line_info.
+       Callers update.
+
 2014-08-27  Doug Evans  <dje@google.com>
 
        * dwarf2read.c (dwarf_record_line): Fix typo.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index fdadbdf9f88fea260e2b95112c7f4d4d1815d7f6..be32309803790930adb44c9afe115e938d093c3d 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1512,8 +1512,7 @@ static struct line_header *dwarf_decode_line_header (unsigned int offset,
                                                     struct dwarf2_cu *cu);
 
 static void dwarf_decode_lines (struct line_header *, const char *,
-                               struct dwarf2_cu *, struct partial_symtab *,
-                               int);
+                               struct dwarf2_cu *, struct partial_symtab *);
 
 static void dwarf2_start_subfile (const char *, const char *, const char *);
 
@@ -4449,7 +4448,7 @@ dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
     return;  /* No linetable, so no includes.  */
 
   /* NOTE: pst->dirname is DW_AT_comp_dir (if present).  */
-  dwarf_decode_lines (lh, pst->dirname, cu, pst, 1);
+  dwarf_decode_lines (lh, pst->dirname, cu, pst);
 
   free_line_header (lh);
 }
@@ -8968,8 +8967,7 @@ find_file_and_directory (struct die_info *die, struct dwarf2_cu *cu,
 
 /* Handle DW_AT_stmt_list for a compilation unit.
    DIE is the DW_TAG_compile_unit die for CU.
-   COMP_DIR is the compilation directory.
-   WANT_LINE_INFO is non-zero if the pc/line-number mapping is needed.  */
+   COMP_DIR is the compilation directory.  */
 
 static void
 handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu,
@@ -8990,7 +8988,7 @@ handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu,
        {
          cu->line_header = line_header;
          make_cleanup (free_cu_line_header, cu);
-         dwarf_decode_lines (line_header, comp_dir, cu, NULL, 1);
+         dwarf_decode_lines (line_header, comp_dir, cu, NULL);
        }
     }
 }
@@ -17601,15 +17599,13 @@ dwarf_decode_lines_1 (struct line_header *lh, const char *comp_dir,
 
 static void
 dwarf_decode_lines (struct line_header *lh, const char *comp_dir,
-                   struct dwarf2_cu *cu, struct partial_symtab *pst,
-                   int want_line_info)
+                   struct dwarf2_cu *cu, struct partial_symtab *pst)
 {
   struct objfile *objfile = cu->objfile;
   const int decode_for_pst_p = (pst != NULL);
   struct subfile *first_subfile = current_subfile;
 
-  if (want_line_info)
-    dwarf_decode_lines_1 (lh, comp_dir, cu, decode_for_pst_p);
+  dwarf_decode_lines_1 (lh, comp_dir, cu, decode_for_pst_p);
 
   if (decode_for_pst_p)
     {