[llvm] 7b74706 - [llvm-objdump] --adjust-vma adjust symbol table

[Shivam Gupta via llvm-commits]

Author: Shivam Gupta
Date: 2023-09-11T09:57:27+05:30
New Revision: 7b7470600c1b30d6f1acf500976e1c06e5282aa0

URL: https://github.com/llvm/llvm-project/commit/7b7470600c1b30d6f1acf500976e1c06e5282aa0
DIFF: https://github.com/llvm/llvm-project/commit/7b7470600c1b30d6f1acf500976e1c06e5282aa0.diff

LOG: [llvm-objdump] --adjust-vma adjust symbol table

Add a shouldAdjustVA(Section) guard on top of address update.

Update llvm-objdump file to update symbol table when --adjust-vma used.

Fixes #63203

Patch by HamidrezaSK (Hamidreza Sanaee)

Added: 
    

Modified: 
    llvm/test/tools/llvm-objdump/X86/adjust-vma.test
    llvm/tools/llvm-objdump/llvm-objdump.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objdump/X86/adjust-vma.test b/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
index 413bf3ac8c2e122..e033731ec7ab01d 100644
--- a/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
+++ b/llvm/test/tools/llvm-objdump/X86/adjust-vma.test
@@ -35,9 +35,9 @@
 # NOADJUST-NEXT:  0000000000000000  l   .debug_str 0000000000000000 debug_str_sym
 
 # ADJUST:        SYMBOL TABLE:
-# ADJUST-NEXT:    0000000000000001  l F .text      0000000000000000 func
-# ADJUST-NEXT:    0000000000000000  l   .text      0000000000000000 sym
-# ADJUST-NEXT:    0000000000000000  l d .text      0000000000000000 .text
+# ADJUST-NEXT:    0000000000123001  l F .text      0000000000000000 func
+# ADJUST-NEXT:    0000000000123000  l   .text      0000000000000000 sym
+# ADJUST-NEXT:    0000000000123000  l d .text      0000000000000000 .text
 # ADJUST-NEXT:    0000000000003333  l   *ABS*      0000000000000000 abs
 # ADJUST-NEXT:    0000000000000000  l   .debug_str 0000000000000000 debug_str_sym
 

diff  --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 96d74d6e2d5e865..e4e1ceb9b3f97f6 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -2555,6 +2555,9 @@ void Dumper::printSymbol(const SymbolRef &Symbol,
     return;
   }
   uint64_t Address = *AddrOrErr;
+  section_iterator SecI = unwrapOrError(Symbol.getSection(), FileName);
+  if (SecI != O.section_end() && shouldAdjustVA(*SecI))
+    Address += AdjustVMA;
   if ((Address < StartAddress) || (Address > StopAddress))
     return;
   SymbolRef::Type Type =