Correct .dynstr finding of getDynamicStrTab()

cabbaken · cabbaken · commit 2da20cd62ae6 · 2025-02-20T09:10:01.000Z
More info: #125679 (comment) Signed-off-by: Ruoyu Qiu <cabbaken@outlook.com>
diff --git a/llvm/test/tools/llvm-objdump/ELF/private-headers.test b/llvm/test/tools/llvm-objdump/ELF/private-headers.test
@@ -30,6 +30,7 @@ Sections:
   - Name:    .dynamic
     Type:    SHT_DYNAMIC
     Flags:   [ SHF_ALLOC ]
+    Link:    1
     Entries:
      - Tag:   DT_NEEDED
        Value: 0x1
diff --git a/llvm/tools/llvm-objdump/ELFDump.cpp b/llvm/tools/llvm-objdump/ELFDump.cpp
@@ -78,8 +78,8 @@ static Expected<StringRef> getDynamicStrTab(const ELFFile<ELFT> &Elf) {
     return SectionsOrError.takeError();
 
   for (const typename ELFT::Shdr &Sec : *SectionsOrError) {
-    if (Sec.sh_type == ELF::SHT_DYNSYM)
-      return Elf.getStringTableForSymtab(Sec);
+    if (Sec.sh_type == ELF::SHT_DYNAMIC)
+      return Elf.getLinkAsStrtab(Sec);
   }
 
   return createError("dynamic string table not found");

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ static Expected<StringRef> getDynamicStrTab(const ELFFile<ELFT> &Elf) {`
`78`	`78`	`return SectionsOrError.takeError();`
`79`	`79`
`80`	`80`	`for (const typename ELFT::Shdr &Sec : *SectionsOrError) {`
`81`		`- if (Sec.sh_type == ELF::SHT_DYNSYM)`
`82`		`- return Elf.getStringTableForSymtab(Sec);`
	`81`	`+ if (Sec.sh_type == ELF::SHT_DYNAMIC)`
	`82`	`+ return Elf.getLinkAsStrtab(Sec);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`return createError("dynamic string table not found");`