[llvm] r352383 - [llvm-objdump] - Restore a piece of code removed by mistake in r352366.

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Mon Jan 28 08:36:12 PST 2019


Author: grimar
Date: Mon Jan 28 08:36:12 2019
New Revision: 352383

URL: http://llvm.org/viewvc/llvm-project?rev=352383&view=rev
Log:
[llvm-objdump] - Restore a piece of code removed by mistake in r352366.

Seems when committed the r352366
("[llvm-objdump] - Print LMAs when dumping section headers.")
I resolved merge conflict incorrectly and removed this piece by mistake.

Bots did not catch this yet, seems they are slow today,
but the `X86/adjust-vma.test` test case fails locally for me without that.




Modified:
    llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp

Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=352383&r1=352382&r2=352383&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Mon Jan 28 08:36:12 2019
@@ -1547,6 +1547,9 @@ void llvm::printSectionHeaders(const Obj
     StringRef Name;
     error(Section.getName(Name));
     uint64_t VMA = Section.getAddress();
+    if (shouldAdjustVA(Section))
+      VMA += AdjustVMA;
+
     uint64_t Size = Section.getSize();
     bool Text = Section.isText();
     bool Data = Section.isData();




More information about the llvm-commits mailing list