Do not assume .idata is zero-initialized.
We initialize .text section with 0xcc (INT3 instruction), so we need to
explicitly write data even if it is zero if it can be in a .text section.
If you specify /merge:.rdata=.text, .rdata (which contains .idata) is put
to .text, so we need to do this.
Fixes https://bugs.llvm.org/show_bug.cgi?id=39826
Differential Revision: https://reviews.llvm.org/D55098
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@348000 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/COFF/Chunks.cpp b/COFF/Chunks.cpp
index ae37a96..29131d7 100644
--- a/COFF/Chunks.cpp
+++ b/COFF/Chunks.cpp
@@ -619,6 +619,7 @@
void StringChunk::writeTo(uint8_t *Buf) const {
memcpy(Buf + OutputSectionOff, Str.data(), Str.size());
+ Buf[OutputSectionOff + Str.size()] = '\0';
}
ImportThunkChunkX64::ImportThunkChunkX64(Defined *S) : ImpSymbol(S) {
diff --git a/COFF/DLL.cpp b/COFF/DLL.cpp
index 235cfa7..599cc58 100644
--- a/COFF/DLL.cpp
+++ b/COFF/DLL.cpp
@@ -416,6 +416,8 @@
size_t getSize() const override { return Size * 4; }
void writeTo(uint8_t *Buf) const override {
+ memset(Buf + OutputSectionOff, 0, getSize());
+
for (const Export &E : Config->Exports) {
uint8_t *P = Buf + OutputSectionOff + E.Ordinal * 4;
uint32_t Bit = 0;
diff --git a/test/COFF/export.test b/test/COFF/export.test
index a00a29c..8bf8c44 100644
--- a/test/COFF/export.test
+++ b/test/COFF/export.test
@@ -97,3 +97,12 @@
FORWARDER: 0 0
FORWARDER: 1 0x1010 exportfn
FORWARDER: 2 foo (forwarded to kernel32.foobar)
+
+# RUN: lld-link /out:%t.dll /dll %t.obj /merge:.rdata=.text /export:exportfn1 /export:exportfn2
+# RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=MERGE -match-full-lines %s
+
+MERGE: DLL name: export.test.tmp.dll
+MERGE: Ordinal RVA Name
+MERGE-NEXT: 0 0
+MERGE-NEXT: 1 0x1008 exportfn1
+MERGE-NEXT: 2 0x1010 exportfn2
