espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove dwarf_decode_lines argumewant_line_info

Browse Source 
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.
This commit is contained in:
Yao Qi
2014-08-26 21:02:49 +08:00
parent 53116d5d21
commit a1b34d156a
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -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> 2014-08-27 Doug Evans <dje@google.com>
* dwarf2read.c (dwarf_record_line): Fix typo. * dwarf2read.c (dwarf_record_line): Fix typo.

14
gdb/dwarf2read.c
View File

@ -1512,8 +1512,7 @@ static struct line_header *dwarf_decode_line_header (unsigned int offset,
struct dwarf2_cu *cu); struct dwarf2_cu *cu);
static void dwarf_decode_lines (struct line_header *, const char *, static void dwarf_decode_lines (struct line_header *, const char *,
struct dwarf2_cu *, struct partial_symtab *, struct dwarf2_cu *, struct partial_symtab *);
int);
static void dwarf2_start_subfile (const char *, const char *, const char *); 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. */ return; /* No linetable, so no includes. */
/* NOTE: pst->dirname is DW_AT_comp_dir (if present). */ /* 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); 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. /* Handle DW_AT_stmt_list for a compilation unit.
DIE is the DW_TAG_compile_unit die for CU. DIE is the DW_TAG_compile_unit die for CU.
COMP_DIR is the compilation directory. COMP_DIR is the compilation directory. */
WANT_LINE_INFO is non-zero if the pc/line-number mapping is needed. */
static void static void
handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu, 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; cu->line_header = line_header;
make_cleanup (free_cu_line_header, cu); 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,14 +17599,12 @@ dwarf_decode_lines_1 (struct line_header *lh, const char *comp_dir,
static void static void
dwarf_decode_lines (struct line_header *lh, const char *comp_dir, dwarf_decode_lines (struct line_header *lh, const char *comp_dir,
struct dwarf2_cu *cu, struct partial_symtab *pst, struct dwarf2_cu *cu, struct partial_symtab *pst)
int want_line_info)
{ {
struct objfile *objfile = cu->objfile; struct objfile *objfile = cu->objfile;
const int decode_for_pst_p = (pst != NULL); const int decode_for_pst_p = (pst != NULL);
struct subfile *first_subfile = current_subfile; 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) if (decode_for_pst_p)