[11/13,gdb/symtab] Don't defer backward refs, inter-cu intra-shard case
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gdb_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
success
|
Testing passed
|
Commit Message
Consider the test-case gdb.dwarf2/backward-spec-inter-cu.exp with
debug_handle_deferred_entries:
...
$ gdb -q -batch -iex "maint set worker-threads 0" backward-spec-inter-cu:
handle_deferred_entries, intra-shard case
parent map
0x00000000000000c8 0x3254a80 (0xc7)
0x00000000000000d3 0x0
0x00000000000000e1 0x2935500 (deferred)
0x00000000000000e2 0x0
parent valid map
0x000000000000002e 0x1
0x0000000000000045 0x0
0x0000000000000062 0x1
0x0000000000000084 0x0
0x00000000000000be 0x1
0x00000000000000d4 0x0
0x00000000000000e1 0x1
0x00000000000000eb 0x0
0x0000000000000123 0x1
0x00000000000002ae 0x0
Resolve deferred: 0xe1 -> 0xcb: 0xc7
handle_deferred_entries, inter-shard case
0x00000000000000c8 0x3254a80 (0xc7)
0x00000000000000d3 0x0
0x00000000000000e1 0x2935500 (deferred)
0x00000000000000e2 0x0
...
It has a backward inter-cu, intra-shard dependency, which is first deferred
and then resolved in the intra-shard case.
However, we can handle this more optimally: we can not defer and resolve
immediately, because by the time that we process 0xe1, 0xcb is already
processed by the same shard, and consequently present in the parent map.
Fix this by not deferring dependencies that are present in the shard's parent
map, such that we have instead:
...
handle_deferred_entries, intra-shard case
parent map
0x00000000000000c8 0x3d36cb0 (0xc7)
0x00000000000000d3 0x0
parent valid map
0x000000000000002e 0x1
0x0000000000000045 0x0
0x0000000000000062 0x1
0x0000000000000084 0x0
0x00000000000000be 0x1
0x00000000000000d4 0x0
0x00000000000000e1 0x1
0x00000000000000eb 0x0
0x0000000000000123 0x1
0x00000000000002ae 0x0
handle_deferred_entries, inter-shard case
0x00000000000000c8 0x3d36cb0 (0xc7)
0x00000000000000d3 0x0
...
Tested on x86_64-linux.
---
gdb/dwarf2/read.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
@@ -4701,6 +4701,12 @@ class cooked_index_storage
m_index->set_parent_valid (start, end);
}
+ /* Return true if find_parents can be relied upon. */
+ bool parent_valid (CORE_ADDR addr)
+ {
+ return m_index->parent_valid (addr);
+ }
+
private:
/* Hash function for a cutu_reader. */
@@ -4855,6 +4861,12 @@ class cooked_indexer
{
m_index_storage->set_parent_valid (start, end);
}
+
+ /* Return true if find_parents can be relied upon. */
+ bool parent_valid (CORE_ADDR addr)
+ {
+ return m_index_storage->parent_valid (addr);
+ }
};
/* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
@@ -16391,7 +16403,11 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu,
const gdb_byte *new_info_ptr = (new_reader->buffer
+ to_underlying (origin_offset));
- if ((new_reader->cu != reader->cu
+ CORE_ADDR origin_addr = form_addr (origin_offset, origin_is_dwz,
+ reader->cu->per_cu->is_debug_types);
+
+ if (((new_reader->cu != reader->cu
+ && !parent_valid (origin_addr))
|| (new_reader->cu == reader->cu
&& new_info_ptr > watermark_ptr))
&& *parent_entry == nullptr)