Skip to content

Commit 3f594ed

Browse files
committed
Fix lookup of symbols at the same address with no size vs. size
This fixes a failing testcase on Fedora 30 x86_64 (regression Fedora 29->30): PASS: ./bin/lldb ./lldb-test-build.noindex/functionalities/unwind/noreturn/TestNoreturnUnwind.test_dwarf/a.out -o 'settings set symbols.enable-external-lookup false' -o r -o bt -o quit * frame #0: 0x00007ffff7aa6e75 libc.so.6`__GI_raise + 325 frame swiftlang#1: 0x00007ffff7a91895 libc.so.6`__GI_abort + 295 frame swiftlang#2: 0x0000000000401140 a.out`func_c at main.c:12:2 frame swiftlang#3: 0x000000000040113a a.out`func_b at main.c:18:2 frame swiftlang#4: 0x0000000000401134 a.out`func_a at main.c:26:2 frame swiftlang#5: 0x000000000040112e a.out`main(argc=<unavailable>, argv=<unavailable>) at main.c:32:2 frame swiftlang#6: 0x00007ffff7a92f33 libc.so.6`__libc_start_main + 243 frame swiftlang#7: 0x000000000040106e a.out`_start + 46 vs. FAIL - unrecognized abort() function: ./bin/lldb ./lldb-test-build.noindex/functionalities/unwind/noreturn/TestNoreturnUnwind.test_dwarf/a.out -o 'settings set symbols.enable-external-lookup false' -o r -o bt -o quit * frame #0: 0x00007ffff7aa6e75 libc.so.6`.annobin_raise.c + 325 frame swiftlang#1: 0x00007ffff7a91895 libc.so.6`.annobin_loadmsgcat.c_end.unlikely + 295 frame swiftlang#2: 0x0000000000401140 a.out`func_c at main.c:12:2 frame swiftlang#3: 0x000000000040113a a.out`func_b at main.c:18:2 frame swiftlang#4: 0x0000000000401134 a.out`func_a at main.c:26:2 frame swiftlang#5: 0x000000000040112e a.out`main(argc=<unavailable>, argv=<unavailable>) at main.c:32:2 frame swiftlang#6: 0x00007ffff7a92f33 libc.so.6`.annobin_libc_start.c + 243 frame swiftlang#7: 0x000000000040106e a.out`.annobin_init.c.hot + 46 The extra ELF symbols are there due to Annobin (I did not investigate why this problem happened specifically since F-30 and not since F-28). It is due to: Symbol table '.dynsym' contains 2361 entries: Valu e Size Type Bind Vis Name 0000000000022769 5 FUNC LOCAL DEFAULT _nl_load_domain.cold 000000000002276e 0 NOTYPE LOCAL HIDDEN .annobin_abort.c.unlikely ... 000000000002276e 0 NOTYPE LOCAL HIDDEN .annobin_loadmsgcat.c_end.unlikely ... 000000000002276e 0 NOTYPE LOCAL HIDDEN .annobin_textdomain.c_end.unlikely 000000000002276e 548 FUNC GLOBAL DEFAULT abort 000000000002276e 548 FUNC GLOBAL DEFAULT abort@@GLIBC_2.2.5 000000000002276e 548 FUNC LOCAL DEFAULT __GI_abort 0000000000022992 0 NOTYPE LOCAL HIDDEN .annobin_abort.c_end.unlikely Differential Revision: https://reviews.llvm.org/D63540 llvm-svn: 364773
1 parent 34a0b16 commit 3f594ed

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.text
2+
.byte 0
3+
sizeless:
4+
sizeful:
5+
.byte 0
6+
.byte 0
7+
sizeend:
8+
.size sizeful, sizeend - sizeful
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Some targets do not have the .size directive.
2+
# RUN: %clang -target x86_64-unknown-unknown-elf %S/Inputs/sizeless-symbol.s -c -o %t.o
3+
# RUN: %lldb %t.o -s %s -o quit | FileCheck %s
4+
5+
image lookup --address 1
6+
# CHECK: Summary: sizeless-symbol.test.tmp.o`sizeful
7+
image lookup --address 2
8+
# CHECK: Summary: sizeless-symbol.test.tmp.o`sizeful + 1
9+
image dump symtab
10+
# CHECK: Index UserID DSX Type File Address/Value Load Address Size Flags Name
11+
# CHECK-NEXT:------- ------ --- --------------- ------------------ ------------------ ------------------ ---------- ----------------------------------
12+
# CHECK-NEXT:[ 0] 1 Code 0x0000000000000003 0x0000000000000000 0x00000000 sizeend
13+
# CHECK-NEXT:[ 1] 2 Code 0x0000000000000001 0x0000000000000002 0x00000000 sizeful
14+
# CHECK-NEXT:[ 2] 3 Code 0x0000000000000001 0x0000000000000000 0x00000000 sizeless

lldb/source/Symbol/Symtab.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,14 @@ void Symtab::InitAddressIndexes() {
896896
for (size_t i = 0; i < num_entries; i++) {
897897
FileRangeToIndexMap::Entry *entry =
898898
m_file_addr_to_index.GetMutableEntryAtIndex(i);
899-
if (entry->GetByteSize() == 0) {
900-
addr_t curr_base_addr = entry->GetRangeBase();
899+
if (entry->GetByteSize() > 0)
900+
continue;
901+
addr_t curr_base_addr = entry->GetRangeBase();
902+
// Symbols with non-zero size will show after zero-sized symbols on the
903+
// same address. So do not set size of a non-last zero-sized symbol.
904+
if (i == num_entries - 1 ||
905+
m_file_addr_to_index.GetMutableEntryAtIndex(i + 1)
906+
->GetRangeBase() != curr_base_addr) {
901907
const RangeVector<addr_t, addr_t>::Entry *containing_section =
902908
section_ranges.FindEntryThatContains(curr_base_addr);
903909

0 commit comments

Comments
 (0)