Skip to content

[LLD][COFF] Process all ARM64EC import symbols in MapFile's getSymbols #109118

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
Sep 19, 2024
Merged

[LLD][COFF] Process all ARM64EC import symbols in MapFile's getSymbols #109118

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
1 change: 1 addition & 0 deletions lld/COFF/Chunks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ class ImportThunkChunkARM64EC : public ImportThunkChunk {
void writeTo(uint8_t *buf) const override;

Defined *exitThunk;
Defined *sym = nullptr;

private:
ImportFile *file;
Expand Down
3 changes: 2 additions & 1 deletion lld/COFF/InputFiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,8 @@ void ImportFile::parse() {

StringRef impChkName = saver().save("__impchk_" + name);
impchkThunk = make<ImportThunkChunkARM64EC>(this);
ctx.symtab.addImportThunk(impChkName, impSym, impchkThunk);
impchkThunk->sym =
ctx.symtab.addImportThunk(impChkName, impSym, impchkThunk);
ctx.driver.pullArm64ECIcallHelper();
}
}
Expand Down
8 changes: 8 additions & 0 deletions lld/COFF/MapFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ static void getSymbols(const COFFLinkerContext &ctx,
syms.push_back(file->impSym);
if (file->thunkSym && file->thunkSym->isLive())
syms.push_back(file->thunkSym);
if (file->auxThunkSym && file->auxThunkSym->isLive())
syms.push_back(file->auxThunkSym);
if (file->impchkThunk)
syms.push_back(file->impchkThunk->sym);
if (file->impECSym)
syms.push_back(file->impECSym);
if (file->auxImpCopySym)
syms.push_back(file->auxImpCopySym);
}

sortUniqueSymbols(syms, ctx.config.imageBase);
Expand Down
28 changes: 25 additions & 3 deletions lld/test/COFF/arm64ec-import.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ RUN: llvm-lib -machine:x64 -def:test.def -out:test-x86_64.lib

Link using ARM64EC import library:
RUN: lld-link -machine:arm64ec -dll -noentry -out:out.dll loadconfig-arm64ec.obj icall.obj hybmp.obj \
RUN: test.obj test-arm64ec.lib test2-arm64ec.lib
RUN: test.obj test-arm64ec.lib test2-arm64ec.lib -map

Link using x86_64 import library:
RUN: lld-link -machine:arm64ec -dll -noentry -out:out2.dll loadconfig-arm64ec.obj icall.obj hybmp.obj \
RUN: test.obj test-x86_64.lib test2-arm64ec.lib
RUN: test.obj test-x86_64.lib test2-arm64ec.lib -map

Link using x86_64 object file:
RUN: lld-link -machine:arm64ec -dll -noentry -out:out3.dll loadconfig-arm64ec.obj icall.obj hybmp.obj \
RUN: test-x86_64.obj test-arm64ec.lib test2-arm64ec.lib
RUN: test-x86_64.obj test-arm64ec.lib test2-arm64ec.lib -map

RUN: llvm-readobj --coff-imports out.dll | FileCheck --check-prefix=IMPORTS %s
RUN: llvm-readobj --coff-imports out2.dll | FileCheck --check-prefix=IMPORTS %s
Expand Down Expand Up @@ -87,6 +87,28 @@ TESTSEC-X64-NEXT: 0x180007010 08300000 00500000 10300000 20300000
TESTSEC-X64-NEXT: 0x180007020 14100000 28100000 00200000 08100000
TESTSEC-X64-NEXT: 0x180007030 3c100000 a0420000

RUN: FileCheck --check-prefix=MAP %s < out.map
RUN: FileCheck --check-prefix=MAP %s < out2.map
RUN: FileCheck --check-prefix=MAP %s < out3.map
MAP: 0001:00000008 #func 0000000180001008 test{{.*}}:test.dll
MAP-NEXT: 0001:00000014 __impchk_func 0000000180001014 test{{.*}}:test.dll
MAP-NEXT: 0001:00000028 __impchk_func2 0000000180001028 test{{.*}}:test.dll
MAP-NEXT: 0001:0000003c #t2func 000000018000103c test2{{.*}}:test2.dll
MAP-NEXT: 0001:00000048 __impchk_t2func 0000000180001048 test2{{.*}}:test2.dll
MAP: 0001:00001000 func 0000000180002000 test{{.*}}:test.dll
MAP-NEXT: 0002:00000000 __imp_data 0000000180003000 test{{.*}}:test.dll
MAP-NEXT: 0002:00000008 __imp_aux_func 0000000180003008 test{{.*}}:test.dll
MAP-NEXT: 0002:00000010 __imp_aux_func2 0000000180003010 test{{.*}}:test.dll
MAP-NEXT: 0002:00000020 __imp_aux_t2func 0000000180003020 test2{{.*}}:test2.dll
MAP: 0002:00001298 __auximpcopy_data 0000000180004298 test{{.*}}:test.dll
MAP-NEXT: 0002:000012a0 __auximpcopy_func 00000001800042a0 test{{.*}}:test.dll
MAP-NEXT: 0002:000012a8 __auximpcopy_func2 00000001800042a8 test{{.*}}:test.dll
MAP-NEXT: 0002:000012b8 __auximpcopy_t2func 00000001800042b8 test2{{.*}}:test2.dll
MAP: 0002:00002000 __imp_aux_data 0000000180005000 test{{.*}}:test.dll
MAP-NEXT: 0002:00002008 __imp_func 0000000180005008 test{{.*}}:test.dll
MAP-NEXT: 0002:00002010 __imp_func2 0000000180005010 test{{.*}}:test.dll
MAP-NEXT: 0002:00002020 __imp_t2func 0000000180005020 test2{{.*}}:test2.dll

RUN: llvm-readobj --headers out.dll | FileCheck -check-prefix=HEADERS %s
RUN: llvm-readobj --headers out2.dll | FileCheck -check-prefix=HEADERS %s
RUN: llvm-readobj --headers out3.dll | FileCheck -check-prefix=HEADERS %s
Expand Down
Loading