From patchwork Wed Jun 10 20:35:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 7105 Received: (qmail 33406 invoked by alias); 10 Jun 2015 20:35:57 -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 33383 invoked by uid 89); 10 Jun 2015 20:35:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 10 Jun 2015 20:35:55 +0000 Received: from EUSAAHC004.ericsson.se (Unknown_Domain [147.117.188.84]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 88.A8.06409.1C938755; Wed, 10 Jun 2015 15:21:05 +0200 (CEST) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.86) with Microsoft SMTP Server id 14.3.210.2; Wed, 10 Jun 2015 16:35:52 -0400 Message-ID: <55789FA8.6070901@ericsson.com> Date: Wed, 10 Jun 2015 16:35:52 -0400 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Doug Evans CC: gdb-patches Subject: Re: [PATCH 4/6] DWARF Two Level Line Tables: lnp_state_machine, lnp_reader_state References: <001a11376bdcb0959e051717abd5@google.com> <557893A6.1050000@ericsson.com> In-Reply-To: X-IsSubscribed: yes > Yikes. > My bad, thanks for catching this. > > LGTM Thanks. I pushed this: From e815d2d2714a395d11abb350eff385931257ed9a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 10 Jun 2015 16:34:16 -0400 Subject: [PATCH] dwarf2read: call dwarf_finish_line when ending a sequence Commit d9b3de22f33e400f7f409cce3acf6c7dab07dd79 introduced a behaviour change where dwarf_finish_line was not called anymore when ending a sequence of machine instructions. This patch restores the original behaviour. gdb/ChangeLog: * dwarf2read.c (dwarf_record_line): Call dwarf_record_line if end_sequence is true. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5b19052..872d88a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-06-10 Simon Marchi + + * dwarf2read.c (dwarf_record_line): Call dwarf_record_line if + end_sequence is true. + 2015-06-10 Jan Kratochvil Code cleanup. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 1e290c3..d79b2e3 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -17658,7 +17658,7 @@ dwarf_record_line (lnp_reader_state *reader, lnp_state_machine *state, lh->file_names[file - 1].included_p = 1; if (reader->record_lines_p && is_stmt) { - if (state->last_subfile != current_subfile) + if (state->last_subfile != current_subfile || end_sequence) { dwarf_finish_line (reader->gdbarch, state->last_subfile, state->address, state->record_line);