[LLD][COFF] Set OrdinalBase to 1 for export table

[alvinhochun]

Summary

Before this, LLD sets OrdinalBase to 0, which deviates from usual
practices. This technically would allow LLD to export a symbol using
ordinal 0, however LLD never use export ordinal 0, which results in
binaries with export tables always having an empty export at ordinal 0.

This change makes LLD set OrdinalBase to 1 and not create the empty
export with ordinal 0, which makes its behaviour more in line with both
the MSVC linker and the GNU linker.

[mstorsjo]

Looks great to me, thanks! I've wondered about this difference to other tools (although I haven't used link.exe that much that I'd have noticed the difference there too), but never enough to dig into it.

I didn't review how the other tools does it - I trust your judgement that link.exe also does it like this, where I trust link.exe much more as reference than ld.bfd.

Leaving open if @rnk wants to have a look too, otherwise I'd be happy to approve this in a couple days.

lld/test/COFF/export-all.s

11

Shouldn't this just be changed into a plain # CHECK: Name: comdatFunc?

[alvinhochun]

lld/test/COFF/export-all.s

11

I thought we can use this CHECK and CHECK-SAME combo to make sure that the first symbol will be the expected comdatFunc instead of an empty entry. Though other tests has already covered this case, so your suggestion is fine too. Feel free to change it when committing, thanks.

[mstorsjo]

lld/test/COFF/export-all.s

11

Oh, right, that's a neat way of enforcing that - although AFAIK an uncommon idiom for writing tests. No strong opinion on it anyway.

[mstorsjo]

In D134140#3799005, @mstorsjo wrote:

Leaving open if @rnk wants to have a look too, otherwise I'd be happy to approve this in a couple days.

It seems I forgot about this one; approving now, will apply later.

lld/COFF/DLL.cpp

size_t getSize() const override {
     return sizeof(export_directory_table_entry);
   }
 
   void writeTo(uint8_t *buf) const override {
     memset(buf, 0, getSize());
 
     auto *e = (export_directory_table_entry *)(buf);
     e->NameRVA = dllName->getRVA();
-    e->OrdinalBase = 0;
-    e->AddressTableEntries = maxOrdinal + 1;
+    e->OrdinalBase = 1;
+    e->AddressTableEntries = maxOrdinal;
     e->NumberOfNamePointers = nameTabSize;
     e->ExportAddressTableRVA = addressTab->getRVA();
     e->NamePointerRVA = nameTab->getRVA();
     e->OrdinalTableRVA = ordinalTab->getRVA();
   }
 
   uint16_t maxOrdinal;
   uint16_t nameTabSize;
   Chunk *dllName;
   Chunk *addressTab;
   Chunk *nameTab;
   Chunk *ordinalTab;
 };
 
 class AddressTableChunk : public NonSectionChunk {
 public:
-  explicit AddressTableChunk(size_t maxOrdinal) : size(maxOrdinal + 1) {}
+  explicit AddressTableChunk(size_t maxOrdinal) : size(maxOrdinal) {}
   size_t getSize() const override { return size * 4; }
 
   void writeTo(uint8_t *buf) const override {
     memset(buf, 0, getSize());
 
     for (const Export &e : config->exports) {
-      uint8_t *p = buf + e.ordinal * 4;
+      assert(e.ordinal != 0 && "Export symbol has invalid ordinal");
+      // OrdinalBase is 1, so subtract 1 to get the index.
+      uint8_t *p = buf + (e.ordinal - 1) * 4;
       uint32_t bit = 0;
       // Pointer to thumb code must have the LSB set, so adjust it.
       if (config->machine == ARMNT && !e.data)
         bit = 1;
       if (e.forwardChunk) {
         write32le(p, e.forwardChunk->getRVA() | bit);
       } else {
         assert(cast<Defined>(e.sym)->getRVA() != 0 &&

 public:
   explicit ExportOrdinalChunk(size_t i) : size(i) {}
   size_t getSize() const override { return size * 2; }
 
   void writeTo(uint8_t *buf) const override {
     for (Export &e : config->exports) {
       if (e.noname)
         continue;
-      write16le(buf, e.ordinal);
+      assert(e.ordinal != 0 && "Export symbol has invalid ordinal");
+      // This table stores unbiased indices, so subtract 1 (OrdinalBase).
+      write16le(buf, e.ordinal - 1);
       buf += 2;
     }
   }
 
 private:
   size_t size;
 };
 

lld/test/COFF/directives.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -triple=x86_64-windows %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -dll -out:%t.dll -entry:entry %t.obj -subsystem:console
 # RUN: llvm-objdump -p %t.dll | FileCheck %s
 
 # CHECK:      Export Table:
 # CHECK:      DLL name: directives.s.tmp.dll
 # CHECK:      Ordinal      RVA  Name
-# CHECK-NEXT:       0        0
 # CHECK-NEXT:       1   0x1000  exportfn1
 # CHECK-NEXT:       2   0x1000  exportfn2
 # CHECK-NEXT:       3   0x1000  exportfn3
 # CHECK-NEXT:       4   0x1000  exportfn4
 # CHECK-NEXT:       5   0x1000  exportfn5
 # CHECK-NEXT:       6   0x1000  exportfn6
 
   .global entry

lld/test/COFF/dll.test

 # REQUIRES: x86
 # RUN: yaml2obj %p/Inputs/export.yaml -o %t.obj
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 \
 # RUN:   /export:mangled
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=EXPORT %s
 
 EXPORT:      Export Table:
 EXPORT:      DLL name: dll.test.tmp.dll
 EXPORT:      Ordinal      RVA  Name
-EXPORT-NEXT:       0        0
 EXPORT-NEXT:       1   0x1008  exportfn1
 EXPORT-NEXT:       2   0x1010  exportfn2
 EXPORT-NEXT:       3   0x1010  exportfn3
 EXPORT-NEXT:       4   0x1010  mangled
 
 # RUN: yaml2obj %p/Inputs/export2.yaml -o %t4.obj
 # RUN: rm -f %t4.lib
 # RUN: llvm-ar cru %t4.lib %t4.obj
 # RUN: lld-link /out:%t5.dll /dll %t.obj %t4.lib /export:mangled2
 # RUN: llvm-objdump -p %t5.dll | FileCheck --check-prefix=EXPORT2 %s
 
 EXPORT2:      Export Table:
 EXPORT2:      DLL name: dll.test.tmp5.dll
 EXPORT2:      Ordinal      RVA  Name
-EXPORT2-NEXT:       0        0
 EXPORT2-NEXT:       1   0x1010  exportfn3
 EXPORT2-NEXT:       2   0x101c  mangled2
 
 # RUN: llvm-as -o %t.lto.obj %p/Inputs/export.ll
 # RUN: lld-link -opt:noicf /out:%t.lto.dll /dll %t.lto.obj /export:exportfn1 /export:exportfn2
 # RUN: llvm-objdump -p %t.lto.dll | FileCheck --check-prefix=EXPORT-LTO %s
 
 EXPORT-LTO:      Export Table:
 EXPORT-LTO:      DLL name: dll.test.tmp.lto.dll
 EXPORT-LTO:      Ordinal      RVA  Name
-EXPORT-LTO-NEXT:       0        0
 EXPORT-LTO-NEXT:       1   0x1010  exportfn1
 EXPORT-LTO-NEXT:       2   0x1020  exportfn2
 EXPORT-LTO-NEXT:       3   0x1030  exportfn3
 
 # RUN: lld-link /out:%t.dll /dll %t.obj /implib:%t2.lib \
 # RUN:   /export:exportfn1 /export:exportfn2
 # RUN: yaml2obj %p/Inputs/import.yaml -o %t2.obj
 # RUN: lld-link /out:%t2.exe /entry:main %t2.obj %t2.lib
 # RUN: llvm-readobj --coff-imports %t2.exe | FileCheck -check-prefix=IMPORT %s
 
 # RUN: lld-link /out:%t2.lto.exe /entry:main %t2.obj %t.lto.lib
 # RUN: llvm-readobj --coff-imports %t2.lto.exe | FileCheck -check-prefix=IMPORT %s
 
 IMPORT: Symbol: exportfn1
 IMPORT: Symbol: exportfn2

lld/test/COFF/exclude-symbols-embedded.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-win32-gnu %s -o %t.o
 
 // RUN: lld-link -lldmingw -dll -out:%t.dll %t.o -noentry
 // RUN: llvm-readobj --coff-exports %t.dll | FileCheck --implicit-check-not=Name: %s
 
-// CHECK: Name:
 // CHECK: Name: sym1
 
 .global _sym1
 _sym1:
   ret
 
 .global _sym2
 _sym2:

lld/test/COFF/exclude-symbols.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=i686-win32-gnu %s -o %t.o
 
 // RUN: lld-link -lldmingw -dll -out:%t.dll %t.o -noentry -exclude-symbols:sym2,unknownsym -exclude-symbols:unknownsym,sym3
 // RUN: llvm-readobj --coff-exports %t.dll | FileCheck --implicit-check-not=Name: %s
 
-// CHECK: Name:
 // CHECK: Name: sym1
 
 .global _sym1
 _sym1:
   ret
 
 .global _sym2
 _sym2:
   ret
 
 .global _sym3
 _sym3:
   ret

lld/test/COFF/export-all.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -triple=i686-windows-gnu %s -filetype=obj -o %t.obj
 
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:DllMainCRTStartup@12 %t.obj -implib:%t.lib
 # RUN: llvm-readobj --coff-exports %t.dll | grep Name: | FileCheck %s
 # RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s --check-prefix=CHECK-RVA
 # RUN: llvm-readobj %t.lib | FileCheck -check-prefix=IMPLIB %s
 
-# CHECK: Name:
-# CHECK-NEXT: Name: comdatFunc
+# CHECK:      Name:
+# CHECK-SAME:       comdatFunc
 # CHECK-NEXT: Name: dataSym
 # CHECK-NEXT: Name: foobar
 # CHECK-EMPTY:
 
 # CHECK-RVA: Name: comdatFunc
 # CHECK-RVA-NEXT: RVA: 0x1003
 # CHECK-RVA: Name: dataSym
 # CHECK-RVA-NEXT: RVA: 0x3000

lld/test/COFF/export-arm64.yaml

 # REQUIRES: aarch64
 
 # RUN: yaml2obj %s -o %t.obj
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /implib:%t.lib
 # RUN: llvm-objdump -p %t.dll | FileCheck %s
 # RUN: llvm-objdump -r %t.lib | FileCheck %s --check-prefix=RELOCS
 
 # CHECK:      Export Table:
 # CHECK:      DLL name: export-arm64.yaml.tmp.dll
 # CHECK:      Ordinal      RVA  Name
-# CHECK-NEXT:       0        0
 # CHECK-NEXT:       1   0x1008  exportfn1
 # CHECK-NEXT:       2   0x1010  exportfn2
 # CHECK-NEXT:       3   0x1018  exportfn3
 
 # RELOCS: IMAGE_REL_ARM64_ADDR32NB .idata$6
 # RELOCS: IMAGE_REL_ARM64_ADDR32NB .idata$4
 # RELOCS: IMAGE_REL_ARM64_ADDR32NB .idata$5
 

lld/test/COFF/export-armnt.yaml

 # REQUIRES: arm
 
 # RUN: yaml2obj %s -o %t.obj
 #
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /export:exportdata,data
 # RUN: llvm-objdump -p %t.dll | FileCheck %s
 
 # CHECK:      Export Table:
 # CHECK:      DLL name: export-armnt.yaml.tmp.dll
 # CHECK:      Ordinal      RVA  Name
-# CHECK-NEXT:       0        0
 # CHECK-NEXT:       1   0x3000  exportdata
 # CHECK-NEXT:       2   0x1005  exportfn1
 # CHECK-NEXT:       3   0x1009  exportfn2
 # CHECK-NEXT:       4   0x1009  exportfn3
 
 --- !COFF
 header:
   Machine:         IMAGE_FILE_MACHINE_ARMNT

lld/test/COFF/export-exe.test

 # RUN: lld-link /entry:main /out:%t.exe /subsystem:windows \
 # RUN:   %p/Inputs/ret42.obj /export:main
 # RUN: llvm-objdump -p %t.exe | FileCheck %s
 
 CHECK:      Export Table:
 CHECK-NEXT: DLL name: export-exe.test.tmp.exe
-CHECK-NEXT: Ordinal base: 0
+CHECK-NEXT: Ordinal base: 1
 CHECK-NEXT: Ordinal      RVA  Name
-CHECK-NEXT:       0        0
 CHECK-NEXT:       1   0x1000  main

lld/test/COFF/export.test

 # RUN: yaml2obj %p/Inputs/export.yaml -o %t.obj
 #
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK1 %s
 
 CHECK1:      Export Table:
 CHECK1:      DLL name: export.test.tmp.dll
 CHECK1:      Ordinal      RVA  Name
-CHECK1-NEXT:       0        0
 CHECK1-NEXT:       1   0x1008  exportfn1
 CHECK1-NEXT:       2   0x1010  exportfn2
 
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1,@5 /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK2 %s
 
 CHECK2:      Export Table:
 CHECK2:      DLL name: export.test.tmp.dll
 CHECK2:      Ordinal      RVA  Name
-CHECK2-NEXT:       0        0
 CHECK2-NEXT:       1        0
 CHECK2-NEXT:       2        0
 CHECK2-NEXT:       3        0
 CHECK2-NEXT:       4        0
 CHECK2-NEXT:       5   0x1008  exportfn1
 CHECK2-NEXT:       6   0x1010  exportfn2
 CHECK2-NEXT:       7   0x1010  exportfn3
 
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK3 %s
 
 CHECK3:      Export Table:
 CHECK3:      DLL name: export.test.tmp.dll
 CHECK3:      Ordinal      RVA  Name
-CHECK3-NEXT:       0        0
 CHECK3-NEXT:       1        0
 CHECK3-NEXT:       2        0
 CHECK3-NEXT:       3        0
 CHECK3-NEXT:       4        0
 CHECK3-NEXT:       5   0x1008
 CHECK3-NEXT:       6   0x1010  exportfn2
 
 # RUN: lld-link /out:%t.dll /dll %t.obj /export:f1=exportfn1 /export:f2=exportfn2 /implib:%t.lib
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK4 %s
 # RUN: llvm-nm %t.lib | FileCheck -check-prefix=CHECK4-NM %s
 
 CHECK4:      Export Table:
 CHECK4:      DLL name: export.test.tmp.dll
 CHECK4:      Ordinal      RVA  Name
-CHECK4-NEXT:       0        0
 CHECK4-NEXT:       1   0x1010  exportfn3
 CHECK4-NEXT:       2   0x1008  f1
 CHECK4-NEXT:       3   0x1010  f2
 CHECK4-NM: 00000000 T f1
 CHECK4-NM: 00000000 T f2
 
 # RUN: echo "EXPORTS exportfn1 @3" > %t.def
 # RUN: echo "fn2=exportfn2 @2" >> %t.def
 # RUN: lld-link /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK5 %s
 
 CHECK5:      Export Table:
 CHECK5:      DLL name: export.test.tmp.dll
 CHECK5:      Ordinal      RVA  Name
-CHECK5-NEXT:       0        0
 CHECK5-NEXT:       1        0
 CHECK5-NEXT:       2   0x1010  fn2
 CHECK5-NEXT:       3   0x1008  exportfn1
 CHECK5-NEXT:       4   0x1010  exportfn3
 
 # RUN: lld-link /out:%t.DLL /dll %t.obj /export:exportfn1 /export:exportfn2 \
 # RUN:   /export:exportfn1 /export:exportfn2,@5 >& %t.log
 # RUN: FileCheck -check-prefix=CHECK6 %s < %t.log

 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=FORWARDER %s
 
 # RUN: echo "EXPORTS foo=kernel32.foobar" > %t.def
 # RUN: lld-link /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=FORWARDER %s
 
 FORWARDER: Export Table:
 FORWARDER:  DLL name: export.test.tmp.dll
-FORWARDER:  Ordinal base: 0
+FORWARDER:  Ordinal base: 1
 FORWARDER:  Ordinal      RVA  Name
-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

lld/test/COFF/export32.test

 # RUN: yaml2obj %s -o %t.obj
 #
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK1 %s
 #
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 /merge:.edata=.rdata
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK1 %s
 # RUN: llvm-readobj --file-headers --sections %t.dll | FileCheck -check-prefix=HEADER-MERGE %s
 
 # CHECK1:      Export Table:
 # CHECK1:      DLL name: export32.test.tmp.dll
 # CHECK1:      Ordinal      RVA  Name
-# CHECK1-NEXT:       0        0
 # CHECK1-NEXT:       1   0x1008  exportfn1
 # CHECK1-NEXT:       2   0x1010  exportfn2
 
 # HEADER-MERGE: ExportTableRVA: 0x2000
-# HEADER-MERGE-NEXT: ExportTableSize: 0x7E
+# HEADER-MERGE-NEXT: ExportTableSize: 0x7A
 # HEADER-MERGE: Name: .rdata
-# HEADER-MERGE-NEXT: VirtualSize: 0x7E
+# HEADER-MERGE-NEXT: VirtualSize: 0x7A
 # HEADER-MERGE-NEXT: VirtualAddress: 0x2000
 
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1,@5 \
 # RUN:   /export:exportfn2 /export:mangled
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK2 %s
 
 # CHECK2:      Export Table:
 # CHECK2:      DLL name: export32.test.tmp.dll
 # CHECK2:      Ordinal      RVA  Name
-# CHECK2-NEXT:       0        0
 # CHECK2-NEXT:       1        0
 # CHECK2-NEXT:       2        0
 # CHECK2-NEXT:       3        0
 # CHECK2-NEXT:       4        0
 # CHECK2-NEXT:       5   0x1008  exportfn1
 # CHECK2-NEXT:       6   0x1010  exportfn2
 # CHECK2-NEXT:       7   0x1010  exportfn3
 # CHECK2-NEXT:       8   0x1010  mangled
 
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1,@5,noname /export:exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK3 %s
 
 # CHECK3:      Export Table:
 # CHECK3:      DLL name: export32.test.tmp.dll
 # CHECK3:      Ordinal      RVA  Name
-# CHECK3-NEXT:       0        0
 # CHECK3-NEXT:       1        0
 # CHECK3-NEXT:       2        0
 # CHECK3-NEXT:       3        0
 # CHECK3-NEXT:       4        0
 # CHECK3-NEXT:       5   0x1008
 # CHECK3-NEXT:       6   0x1010  exportfn2
 
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:f1=exportfn1 /export:f2=exportfn2
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK4 %s
 
 # CHECK4:      Export Table:
 # CHECK4:      DLL name: export32.test.tmp.dll
 # CHECK4:      Ordinal      RVA  Name
-# CHECK4-NEXT:       0        0
 # CHECK4-NEXT:       1   0x1010  exportfn3
 # CHECK4-NEXT:       2   0x1008  f1
 # CHECK4-NEXT:       3   0x1010  f2
 
 # RUN: echo "EXPORTS exportfn1 @3" > %t.def
 # RUN: echo "fn2=exportfn2 @2" >> %t.def
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK5 %s
 
 # RUN: echo "EXPORTS exportfn1 @ 3" > %t.def
 # RUN: echo "fn2=exportfn2 @ 2" >> %t.def
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /def:%t.def
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK5 %s
 
 # CHECK5:      Export Table:
 # CHECK5:      DLL name: export32.test.tmp.dll
 # CHECK5:      Ordinal      RVA  Name
-# CHECK5-NEXT:       0        0
 # CHECK5-NEXT:       1        0
 # CHECK5-NEXT:       2   0x1010  fn2
 # CHECK5-NEXT:       3   0x1008  exportfn1
 # CHECK5-NEXT:       4   0x1010  exportfn3
 
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:exportfn1 /export:exportfn2 \
 # RUN:   /export:exportfn1 /export:exportfn2,@5 >& %t.log
 # RUN: FileCheck -check-prefix=CHECK6 %s < %t.log
 
 # CHECK6:     duplicate /export option: _exportfn2
 # CHECK6-NOT: duplicate /export option: _exportfn1
 
 # RUN: lld-link -safeseh:no /out:%t.dll /dll %t.obj /export:foo=mangled
 # RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=CHECK7 %s
 
 # CHECK7:      Export Table:
 # CHECK7:      DLL name: export32.test.tmp.dll
 # CHECK7:      Ordinal      RVA  Name
-# CHECK7-NEXT:       0        0
 # CHECK7-NEXT:       1        0
 # CHECK7-NEXT:       2   0x1010  foo
 
 --- !COFF
 header:
   Machine:         IMAGE_FILE_MACHINE_I386
   Characteristics: []
 sections:

lld/test/COFF/icf-xdata.s

 # REQUIRES: x86
 # RUN: llvm-mc %s -triple x86_64-windows-msvc -filetype=obj -o %t.obj
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll -merge:.xdata=.xdata 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=WARN
 # RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=XDATA
 # RUN: lld-link %t.obj -dll -noentry -out:%t.dll
 # RUN: llvm-readobj --sections %t.dll | FileCheck %s --check-prefix=RDATA
 
 # There shouldn't be much xdata, because all three .pdata entries (12 bytes
 # each) should use the same .xdata unwind info.
 # XDATA:         Name: .rdata
-# XDATA-NEXT:    VirtualSize: 0x73
+# XDATA-NEXT:    VirtualSize: 0x6F
 # XDATA:         Name: .pdata
 # XDATA-NEXT:    VirtualSize: 0x24
 # XDATA:         Name: .xdata
 # XDATA-NEXT:    VirtualSize: 0x8
 #
 # WARN: warning: .xdata=.rdata: already merged into .xdata
 #
 # RDATA:         Name: .rdata
-# RDATA-NEXT:    VirtualSize: 0x7C
+# RDATA-NEXT:    VirtualSize: 0x78
 # RDATA:         Name: .pdata
 # RDATA-NEXT:    VirtualSize: 0x24
 
   .text
 callee:
   ret
 
   .def   xdata1;

lld/test/COFF/imports-gnu-autoexport.s

 # REQUIRES: x86
 #
 # RUN: llvm-mc -triple=x86_64-windows-gnu %p/Inputs/gnu-implib-head.s -filetype=obj -o %t-dabcdh.o
 # RUN: llvm-mc -triple=x86_64-windows-gnu %p/Inputs/gnu-implib-func.s -filetype=obj -o %t-dabcds00000.o
 # RUN: llvm-mc -triple=x86_64-windows-gnu %p/Inputs/gnu-implib-tail.s -filetype=obj -o %t-dabcdt.o
 # RUN: rm -f %t-implib.a
 # RUN: llvm-ar rcs %t-implib.a %t-dabcdh.o %t-dabcds00000.o %t-dabcdt.o
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:main -subsystem:console \
 # RUN:   %p/Inputs/hello64.obj %p/Inputs/std64.lib %t-implib.a -include:func
 # RUN: llvm-readobj --coff-exports %t.dll | FileCheck -check-prefix=EXPORT %s
 
 # Check that only the single normal symbol was exported, none of the symbols
 # from the import library.
 
 EXPORT:      Export {
-EXPORT-NEXT:   Ordinal: 0
-EXPORT-NEXT:   Name:
-EXPORT-NEXT:   RVA: 0x0
-EXPORT-NEXT: }
-EXPORT-NEXT: Export {
 EXPORT-NEXT:   Ordinal: 1
 EXPORT-NEXT:   Name: main
 EXPORT-NEXT:   RVA: 0x1010
 EXPORT-NEXT: }
 EXPORT-NEXT-EMPTY:

lld/test/COFF/includeoptional-export.s

 // REQUIRES: x86
 // RUN: split-file %s %t.dir
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-win32-gnu %t.dir/main.s -o %t.main.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-win32-gnu %t.dir/lib1.s -o %t.lib1.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-win32-gnu %t.dir/lib2.s -o %t.lib2.o
 
 // RUN: rm -f %t.lib.a
 // RUN: llvm-ar cru %t.lib.a %t.lib1.o %t.lib2.o
 // RUN: lld-link -dll -out:%t-1.dll -entry:entry %t.main.o %t.lib.a
 // RUN: lld-link -dll -out:%t-2.dll -entry:entry %t.main.o %t.lib.a -includeoptional:libfunc
 
 // RUN: llvm-readobj --coff-exports %t-1.dll | FileCheck --implicit-check-not=Name: %s --check-prefix=CHECK-DEFAULT
 // RUN: llvm-readobj --coff-exports %t-2.dll | FileCheck --implicit-check-not=Name: %s --check-prefix=CHECK-INCLUDEOPTIONAL
 
-// CHECK-DEFAULT: Name:
 // CHECK-DEFAULT: Name: myfunc
 
-// CHECK-INCLUDEOPTIONAL: Name:
 // CHECK-INCLUDEOPTIONAL: Name: libfunc
 // CHECK-INCLUDEOPTIONAL: Name: myfunc
 // CHECK-INCLUDEOPTIONAL: Name: otherlibfunc
 
 #--- main.s
 .global entry
 entry:
   ret

lld/test/COFF/lto-icf.ll

 ; REQUIRES: x86
 ; Test that ICF works after LTO, i.e. both functions have the same address.
 ; Previously, when we didn't enable function sections, ICF didn't work.
 
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: lld-link -opt:icf -dll -noentry %t.bc -out:%t.dll
 ; RUN: llvm-readobj --coff-exports %t.dll | FileCheck %s
 
 ; CHECK: Export {
-; CHECK: Export {
 ; CHECK:   RVA: 0x[[RVA:.*]]
 ; CHECK: Export {
 ; CHECK:   RVA: 0x[[RVA]]
 ; CHECK-NOT: Export
 
 target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc19.12.25835"