[PECOFF] Sort export table properly.

Export table entries need to be sorted in ASCII-betical order,
so that the loader can find an entry for a function by binary search.

We sorted the entries by its mangled names. That can be different
from their exported names. As a result, LLD produces incorrect export
table, from which the loader complains that a function that actually
exists in a DLL cannot be found.

This patch fixes that issue.

llvm-svn: 222452

diff --git a/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp b/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
index 368bb75cf9e53e711c82ba59de30ec4ccc869024..4edf1124532afff0fa5adb0dcb6643e102d5334f 100644 (file)
--- a/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
@@ -35,7 +35,7 @@ static void assignOrdinals(PECOFFLinkingContext &ctx) {
   std::sort(exports.begin(), exports.end(),
             [](const PECOFFLinkingContext::ExportDesc &a,
                const PECOFFLinkingContext::ExportDesc &b) {
-    return a.name.compare(b.name) < 0;
+    return a.getExternalName().compare(b.getExternalName()) < 0;
   });
 
   int nextOrdinal = (maxOrdinal == -1) ? 1 : (maxOrdinal + 1);
@@ -62,13 +62,14 @@ static bool getExportedAtoms(PECOFFLinkingContext &ctx, MutableFile *file,
     // One can export a symbol with a different name than the symbol
     // name used in DLL. If such name is specified, use it in the
     // .edata section.
-    ret.push_back(TableEntry(desc.getExternalName(), desc.ordinal, atom,
-                             desc.noname));
+    ret.push_back(TableEntry(ctx.undecorateSymbol(desc.getExternalName()),
+                             desc.ordinal, atom, desc.noname));
   }
   std::sort(ret.begin(), ret.end(),
             [](const TableEntry &a, const TableEntry &b) {
     return a.exportName.compare(b.exportName) < 0;
   });
+
   return true;
 }
 
@@ -107,7 +108,7 @@ EdataPass::createNamePointerTable(const PECOFFLinkingContext &ctx,
   size_t offset = 0;
   for (const TableEntry &e : entries) {
     auto *stringAtom = new (_alloc) COFFStringAtom(
-        _file, _stringOrdinal++, ".edata", ctx.undecorateSymbol(e.exportName));
+        _file, _stringOrdinal++, ".edata", e.exportName);
     file->addAtom(*stringAtom);
     addDir32NBReloc(table, stringAtom, _ctx.getMachineType(), offset);
     offset += sizeof(uint32_t);

diff --git a/lld/test/pecoff/export.test b/lld/test/pecoff/export.test
index 3791bdb8702495b3683470fe6f4a26114c8f302a..cbe8960e26fc3be55e32ee3cecf78e2fee326c31 100644 (file)
--- a/lld/test/pecoff/export.test
+++ b/lld/test/pecoff/export.test
@@ -82,5 +82,6 @@ DUP-NOT:  exportfn3@256
 EQUAL:      Export Table:
 EQUAL:      DLL name: export.test.tmp1.dll
 EQUAL:       Ordinal      RVA  Name
-EQUAL-NEXT:       1   0x2008  f1
-EQUAL-NEXT:       2   0x2010  f2
+EQUAL-NEXT:       1   0x2010  exportfn3@256
+EQUAL-NEXT:       2   0x2008  f1
+EQUAL-NEXT:       3   0x2010  f2