Skip to content

[LLD][COFF] Fix ARM64X CHPE exception data size relocation when no x86 .pdata is present #144085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged

[LLD][COFF] Fix ARM64X CHPE exception data size relocation when no x86 .pdata is present #144085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions lld/COFF/Writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2495,22 +2495,16 @@ void Writer::setECSymbols() {
offsetof(data_directory, Size),
ctx.symtab.edataEnd->getRVA() - ctx.symtab.edataStart->getRVA() +
ctx.symtab.edataEnd->getSize());
if (hybridPdata.first) {
if (hybridPdata.first)
ctx.dynamicRelocs->set(
dataDirOffset64 + EXCEPTION_TABLE * sizeof(data_directory) +
offsetof(data_directory, Size),
hybridPdata.last->getRVA() - hybridPdata.first->getRVA() +
hybridPdata.last->getSize());
if (chpeSym) {
size_t size = 0;
if (pdata.first)
size = pdata.last->getRVA() + pdata.last->getSize() -
pdata.first->getRVA();
ctx.dynamicRelocs->set(chpeSym->getRVA() +
offsetof(chpe_metadata, ExtraRFETableSize),
size);
}
}
if (chpeSym && pdata.first)
ctx.dynamicRelocs->set(
chpeSym->getRVA() + offsetof(chpe_metadata, ExtraRFETableSize),
pdata.last->getRVA() + pdata.last->getSize() - pdata.first->getRVA());
}
}

Expand Down
53 changes: 53 additions & 0 deletions lld/test/COFF/pdata-arm64ec.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,63 @@ DIR3-NEXT: ExtraRFETableSize: 0x10
DIR3: ]
DIR3: }

arm64x with no x86 .pdata:

RUN: llvm-objdump -s --section=.pdata test4.dll | FileCheck -check-prefix=DATA4 %s
DATA4: 180006000 00100000 11000001 00200000 11000001 ......... ......
DATA4: 180006010 00300000 0e300000

RUN: lld-link -out:testx2.dll -machine:arm64x arm64-func-sym.obj arm64ec-func-sym.obj \
RUN: loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry

RUN: llvm-readobj --headers --coff-load-config testx2.dll | FileCheck -check-prefix=DIR4 %s
DIR4: ImageOptionalHeader {
DIR4: DataDirectory {
DIR4: ExceptionTableRVA: 0x5000
DIR4-NEXT: ExceptionTableSize: 0x10
DIR4: }
DIR4: }
DIR4: CHPEMetadata [
DIR4: ExtraRFETable: 0x0
DIR4-NEXT: ExtraRFETableSize: 0x0
DIR4: ]
DIR4: HybridObject {
DIR4: ImageOptionalHeader {
DIR4: ExceptionTableRVA: 0x0
DIR4-NEXT: ExceptionTableSize: 0x0
DIR4: }
DIR4: CHPEMetadata [
DIR4: ExtraRFETable: 0x5000
DIR4-NEXT: ExtraRFETableSize: 0x10
DIR4: ]
DIR4: }

arm64x with no ARM .pdata:

RUN: lld-link -out:testx3.dll -machine:arm64x x86_64-func-sym.obj loadconfig-arm64.obj loadconfig-arm64ec.obj -dll -noentry

RUN: llvm-readobj --headers --coff-load-config testx3.dll | FileCheck -check-prefix=DIR5 %s
DIR5: ImageOptionalHeader {
DIR5: DataDirectory {
DIR5: ExceptionTableRVA: 0x0
DIR5-NEXT: ExceptionTableSize: 0x0
DIR5: }
DIR5: }
DIR5: CHPEMetadata [
DIR5: ExtraRFETable: 0x4000
DIR5-NEXT: ExtraRFETableSize: 0xC
DIR5: ]
DIR5: HybridObject {
DIR5: ImageOptionalHeader {
DIR5: ExceptionTableRVA: 0x4000
DIR5-NEXT: ExceptionTableSize: 0xC
DIR5: }
DIR5: CHPEMetadata [
DIR5: ExtraRFETable: 0x0
DIR5-NEXT: ExtraRFETableSize: 0x0
DIR5: ]
DIR5: }

Order of inputs doesn't matter, the data is sorted by type and RVA:

RUN: lld-link -out:test5.dll -machine:arm64ec x86_64-func-sym.obj arm64ec-func-sym.obj \
Expand Down
Loading