[COFF] Consider the ImageBase when reporting section addresses
This lets us reenable the lld test disabled in r243758.
llvm-svn: 243761
diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index ed63f3a..d110b92 100644
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -177,7 +177,7 @@
if (PE32Header)
Result += PE32Header->ImageBase;
else if (PE32PlusHeader)
- Result += PE32Header->ImageBase;
+ Result += PE32PlusHeader->ImageBase;
return Result;
}
@@ -274,7 +274,15 @@
uint64_t COFFObjectFile::getSectionAddress(DataRefImpl Ref) const {
const coff_section *Sec = toSec(Ref);
- return Sec->VirtualAddress;
+ uint64_t Result = Sec->VirtualAddress;
+
+ // The section VirtualAddress does not include ImageBase, and we want to
+ // return virtual addresses.
+ if (PE32Header)
+ Result += PE32Header->ImageBase;
+ else if (PE32PlusHeader)
+ Result += PE32PlusHeader->ImageBase;
+ return Result;
}
uint64_t COFFObjectFile::getSectionSize(DataRefImpl Ref) const {