From patchwork Wed Aug 27 08:49:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 2550 Received: (qmail 16803 invoked by alias); 27 Aug 2014 08:53:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16786 invoked by uid 89); 27 Aug 2014 08:53:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL, BAYES_00, SUBJ_OBFU_PUNCT_FEW, SUBJ_OBFU_PUNCT_MANY autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 27 Aug 2014 08:53:50 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1XMYzD-0004HT-CJ from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 27 Aug 2014 01:53:47 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 27 Aug 2014 01:53:47 -0700 Received: from qiyao.dyndns.org.com (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Wed, 27 Aug 2014 01:53:46 -0700 From: Yao Qi To: Subject: [PATCH] Remove dwarf_decode_lines argumewant_line_info Date: Wed, 27 Aug 2014 16:49:26 +0800 Message-ID: <1409129366-14108-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes 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-27 Yao Qi * 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. --- gdb/dwarf2read.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 4720198..102700a 100644 --- 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) {