Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: dje@google.com (Doug Evans)
To: gdb-patches@sourceware.org, tromey@redhat.com, palves@redhat.com
Subject: [RFA] Fix inconsistency in blockvector addrmap vs non-addrmap handling
Date: Tue, 05 Jun 2012 01:15:00 -0000	[thread overview]
Message-ID: <20120605011446.670FD1E123B@ruffy2.mtv.corp.google.com> (raw)

Hi.

I was seeing the assert in dw2_find_pc_sect_psymtab trigger
and traced it to the fact that when pending_addrmap_interesting gets
set blockvector.map is used instead of blockvector.block.
The difference is that blockvector.block contains entries for the global
and static blocks whereas pending_addrmap doesn't.

This patch fixes this by making them consistent.
I suspect more work is necessary (e.g. can symtabs "overlap" even though
the individual pieces do not?).
But I first want to fix the regression introduced by the change
to dw2_find_pc_sect_psymtab: There is more code in a symtab than is
documented by function and lexical block pc ranges (e.g. C++ method thunks).

Regression tested on amd64-linux, and by verifying the assert no longer
triggers in the testcase I was using.

Ok to commit?

Note that this obviates the need for the patch in:
http://sourceware.org/ml/gdb-patches/2012-05/msg00958.html

Also note that this accompanies this patch:
http://sourceware.org/ml/gdb-patches/2012-06/msg00105.html

2012-06-04  Doug Evans  <dje@google.com>

	* buildsym.c (end_symtab): Add the range of the static block to
	the pending addrmap.

Index: buildsym.c
===================================================================
RCS file: /cvs/src/src/gdb/buildsym.c,v
retrieving revision 1.97
diff -u -p -r1.97 buildsym.c
--- buildsym.c	29 May 2012 20:23:17 -0000	1.97
+++ buildsym.c	5 Jun 2012 00:26:01 -0000
@@ -1024,8 +1027,15 @@ end_symtab (CORE_ADDR end_addr, struct o
     {
       /* Define the STATIC_BLOCK & GLOBAL_BLOCK, and build the
          blockvector.  */
-      finish_block (0, &file_symbols, 0, last_source_start_addr,
-		    end_addr, objfile);
+      struct block *static_block;
+
+      static_block = finish_block (0, &file_symbols, 0,
+				   last_source_start_addr, end_addr,
+				   objfile);
+      /* Mark the range of the static block so that if we end up using
+	 blockvector.map then find_block_in_blockvector behaves identically
+	 regardless of whether the addrmap is present.  */
+      record_block_range (static_block, last_source_start_addr, end_addr - 1);
       finish_block_internal (0, &global_symbols, 0, last_source_start_addr,
 			     end_addr, objfile, 1);
       blockvector = make_blockvector (objfile);


             reply	other threads:[~2012-06-05  1:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-05  1:15 Doug Evans [this message]
2012-06-05 15:06 ` Pedro Alves
2012-06-06 15:54 ` Jan Kratochvil
2012-06-22 18:24 ` ping: " Jan Kratochvil
2012-06-22 19:36 ` Jan Kratochvil
2012-06-22 20:51   ` Doug Evans
2012-06-24 18:34     ` Jan Kratochvil
2012-06-25 11:39       ` Doug Evans
2012-07-03 12:54         ` Jan Kratochvil
2012-07-12  5:19           ` Doug Evans
2012-07-12 20:30             ` Jan Kratochvil
2012-07-13 20:28               ` [commit] " Jan Kratochvil

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120605011446.670FD1E123B@ruffy2.mtv.corp.google.com \
    --to=dje@google.com \
    --cc=gdb-patches@sourceware.org \
    --cc=palves@redhat.com \
    --cc=tromey@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox