[SCM] archer-jankratochvil-entryval: Fix/workaround the DW_TAG_call_site scoping.

[SCM] archer-jankratochvil-entryval: Fix/workaround the DW_TAG_call_site scoping.

[jkratoch]

The branch, archer-jankratochvil-entryval has been updated
       via  23ba11866522e98d7ae7b7feef168274d521c34a (commit)
      from  ae53ce4ec3797f52ad49d87438e527ac8d65db1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 23ba11866522e98d7ae7b7feef168274d521c34a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sun Sep 5 10:22:50 2010 +0200

    Fix/workaround the DW_TAG_call_site scoping.

-----------------------------------------------------------------------

Summary of changes:
 gdb/dwarf2loc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

First 500 lines of diff:
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 2627872..989c1ed 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -592,6 +592,10 @@ call_site_find_chain_1 (struct gdbarch *gdbarch, CORE_ADDR caller_pc,
 	      target_call_site_addr
 	        = BLOCK_START (SYMBOL_BLOCK_VALUE (target_call_site_sym));
 
+	      /* GCC nests the block according to where the call/jump itself belongs.
+		 Match the compensation at read_call_site_scope.  */
+	      target_call_site_addr++;
+
 	      slot = (CORE_ADDR **) htab_find_slot (addr_hash,
 						    &target_call_site_addr,
 						    INSERT);


hooks/post-receive
--
Repository for Project Archer.

[SCM] archer-jankratochvil-entryval: Fix/workaround the DW_TAG_call_site scoping.

[jkratoch]

The branch, archer-jankratochvil-entryval has been updated
       via  c1a07bfdf67a0cf0acba58d0fbd5574036291312 (commit)
      from  8c3b7130c8f955543c61835f22362123ef4a8893 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c1a07bfdf67a0cf0acba58d0fbd5574036291312
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Sep 2 17:20:24 2010 +0200

    Fix/workaround the DW_TAG_call_site scoping.

-----------------------------------------------------------------------

Summary of changes:
 gdb/block.c      |    4 ++++
 gdb/dwarf2read.c |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

First 500 lines of diff:
diff --git a/gdb/block.c b/gdb/block.c
index 7bcee91..1f0409e 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -192,6 +192,10 @@ call_site_stuff_for_pc (CORE_ADDR pc)
   struct type *type;
   struct call_site_stuff *call_site_stuff;
 
+  /* GCC nests the block according to where the call/jump itself belongs.
+     Match the compensation at read_call_site_scope.  */
+  pc--;
+
   if (!blockvector_for_pc_sect_1 (pc, find_pc_mapped_section (pc), &b, NULL))
     return NULL;
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 692fbb5..5a62036 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -5680,6 +5680,9 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu)
     }
   lowpc = DW_ADDR (attr) + baseaddr;
 
+  /* GCC nests the block according to where the call/jump itself belongs.  */
+  lowpc--;
+
   block = finish_block (NULL, &no_symbols, pending_blocks, lowpc, lowpc + 1,
 			objfile);
   record_block_range (block, lowpc, lowpc);


hooks/post-receive
--
Repository for Project Archer.