Relocate block range start and end addresses

gdb/ChangeLog:

	* objfiles.c (objfile_relocate1): Relocate start and end addresses
	for each range in a block.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 319c19685b0639228c32cfa497ff452000e1feba..9da11258001d08d8cc9bc2784f4d53cb50e6eb8d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -49,6 +49,14 @@
        * tracepoint.c (info_scope_command): Likewise.
        * value.c (value_fn_field): Likewise.
 
+       * infrun.c (fill_in_stop_func): Use find_function_entry_range_from_pc
+       in place of find_pc_partial_function.
+       * blockframe.c (find_function_entry_range_from_pc): New function.
+       * symtab.h (find_function_entry_range_from_pc): Declare and document.
+       * objfiles.c (objfile_relocate1): Relocate start and end addresses
+       for each range in a block.
+
+
 2018-08-23  Xavier Roirand  <roirand@adacore.com>
 
        * machoread.c (macho_symfile_read_all_oso): Remove uneeded

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index df28da59cb0a59e0872b710b5d9d087f4675954f..4bffd2048c3117b654d4207fa192fd16c74361ed 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -831,6 +831,14 @@ objfile_relocate1 (struct objfile *objfile,
          BLOCK_START (b) += ANOFFSET (delta, block_line_section);
          BLOCK_END (b) += ANOFFSET (delta, block_line_section);
 
+         if (BLOCK_RANGES (b) != nullptr)
+           for (int j = 0; j < BLOCK_NRANGES (b); j++)
+             {
+               BLOCK_RANGE_START (b, j)
+                 += ANOFFSET (delta, block_line_section);
+               BLOCK_RANGE_END (b, j) += ANOFFSET (delta, block_line_section);
+             }
+
          /* We only want to iterate over the local symbols, not any
             symbols in included symtabs.  */
          ALL_DICT_SYMBOLS (BLOCK_DICT (b), iter, sym)