This is an archive of the discontinued LLVM Phabricator instance.

Differential D40576

COFF: Do not add symbols in discarded sections to SEH handler list.
ClosedPublic

Authored by pcc on Nov 28 2017, 1:27 PM.

Details

Reviewers
ruiu
Commits
rGbcf7f290ffc5: COFF: Do not add symbols in discarded sections to SEH handler list.
rLLD319229: COFF: Do not add symbols in discarded sections to SEH handler list.
rL319229: COFF: Do not add symbols in discarded sections to SEH handler list.

Diff Detail

Repository
rL LLVM

Event Timeline

pcc created this revision.Nov 28 2017, 1:27 PM
Harbormaster completed remote builds in B12569: Diff 124628.Nov 28 2017, 1:27 PM
ruiu accepted this revision.Nov 28 2017, 1:28 PM

LGTM

This revision is now accepted and ready to land.Nov 28 2017, 1:28 PM
Closed by commit rL319229: COFF: Do not add symbols in discarded sections to SEH handler list. (authored by pcc). · Explain WhyNov 28 2017, 1:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
COFF/
3 lines
test/
COFF/
66 lines

Diff 124630

lld/trunk/COFF/InputFiles.cpp

Show First 20 Lines • Show All 374 Lines • ▼ Show 20 Lines if (!SEHCompat || !SXData)
return; return;
ArrayRef<uint8_t> A; ArrayRef<uint8_t> A;
COFFObj->getSectionContents(SXData, A); COFFObj->getSectionContents(SXData, A);
if (A.size() % 4 != 0) if (A.size() % 4 != 0)
fatal(".sxdata must be an array of symbol table indices"); fatal(".sxdata must be an array of symbol table indices");
auto *I = reinterpret_cast<const ulittle32_t *>(A.data()); auto *I = reinterpret_cast<const ulittle32_t *>(A.data());
auto *E = reinterpret_cast<const ulittle32_t *>(A.data() + A.size()); auto *E = reinterpret_cast<const ulittle32_t *>(A.data() + A.size());
for (; I != E; ++I) for (; I != E; ++I)
if (Symbols[*I])
SEHandlers.insert(Symbols[*I]); SEHandlers.insert(Symbols[*I]);
} }
MachineTypes ObjFile::getMachineType() { MachineTypes ObjFile::getMachineType() {
if (COFFObj) if (COFFObj)
return static_cast<MachineTypes>(COFFObj->getMachine()); return static_cast<MachineTypes>(COFFObj->getMachine());
return IMAGE_FILE_MACHINE_UNKNOWN; return IMAGE_FILE_MACHINE_UNKNOWN;
} }
▲ Show 20 Lines • Show All 124 Lines • Show Last 20 Lines

lld/trunk/test/COFF/seh-comdat.test

# RUN: yaml2obj < %s > %t1.obj
# RUN: yaml2obj < %s > %t2.obj
# RUN: lld-link /out:%t.exe /subsystem:console /entry:main %t1.obj %t2.obj
# RUN: llvm-objdump -s %t.exe | FileCheck %s
# CHECK: Contents of section .rdata:
# CHECK: 1000 00200000
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_I386
Characteristics: [ ]
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_DISCARDABLE, IMAGE_SCN_MEM_READ, IMAGE_SCN_LNK_COMDAT ]
Alignment: 1
SectionData: 0000000000000000
- Name: .sxdata
Characteristics: [ IMAGE_SCN_LNK_INFO ]
Alignment: 4
SectionData: 02000000
symbols:
- Name: '@comp.id'
Value: 14766605
SectionNumber: 65535
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- Name: '@feat.00'
Value: 2147484049
SectionNumber: 65535
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 4
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
Selection: IMAGE_COMDAT_SELECT_ANY
- Name: .sxdata
Value: 0
SectionNumber: 2
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 8
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 0
- Name: _main
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...