[DebugInfo] The last byte of the entity is still a part of it.

[samsonov]

I don't think this change is correct. E.g. in dwarfdump-test.elf-x86-64 symbol "main" has address 0x400540 and size 0x24, which means that 0x400564 does *not* belong to this function.

[filcab]

Wow, is my face red. Let's just forget this ever happened :-)

lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp

bool SymbolizableObjectFile::getNameFromSymbolTable(SymbolRef::Type Type,
   if (SymbolMap.empty())
     return false;
   SymbolDesc SD = { Address, Address };
   auto SymbolIterator = SymbolMap.upper_bound(SD);
   if (SymbolIterator == SymbolMap.begin())
     return false;
   --SymbolIterator;
   if (SymbolIterator->first.Size != 0 &&
-      SymbolIterator->first.Addr + SymbolIterator->first.Size <= Address)
+      SymbolIterator->first.Addr + SymbolIterator->first.Size < Address)
     return false;
   Name = SymbolIterator->second.str();
   Addr = SymbolIterator->first.Addr;
   Size = SymbolIterator->first.Size;
   return true;
 }
 
 bool SymbolizableObjectFile::shouldOverrideWithSymbolTable(

test/DebugInfo/llvm-symbolizer.test

 RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64 0x400559" > %t.input
 RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64.debuglink 0x400559" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64 0x400436" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64 0x400528" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64 0x400586" >> %t.input
+RUN: echo "%p/Inputs/dwarfdump-test.elf-x86-64 0x400564" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test2.elf-x86-64 0x4004e8" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test2.elf-x86-64 0x4004f4" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-test4.elf-x86-64 0x62c" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-inl-test.elf-x86-64 0x8dc" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-inl-test.elf-x86-64 0xa05" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-inl-test.elf-x86-64 0x987" >> %t.input
 RUN: echo "%p/Inputs/dwarfdump-inl-test.high_pc.elf-x86-64 0x568" >> %t.input
 RUN: echo "\"%p/Inputs/dwarfdump-test3.elf-x86-64 space\" 0x640" >> %t.input

 CHECK:      _start
 
 CHECK: _Z1fii
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:11
 
 CHECK: DummyClass
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test.cc:4
 
+CHECK:       main
+
 CHECK: a
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test2-helper.cc:2
 
 CHECK: main
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test2-main.cc:4
 
 CHECK:      _Z1cv
 CHECK-NEXT: /tmp/dbginfo{{[/\\]}}dwarfdump-test4-part1.cc:2