Skip to content

[LLD][COFF] Process all live import symbols in MapFile's getSymbols() #109117

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 live import symbols in MapFile's getSymbols() #109117

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
14 changes: 4 additions & 10 deletions lld/COFF/MapFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,10 @@ static void getSymbols(const COFFLinkerContext &ctx,
if (!file->live)
continue;

if (!file->thunkSym)
continue;

if (!file->thunkSym->isLive())
continue;

syms.push_back(file->thunkSym);

if (auto *impSym = dyn_cast_or_null<Defined>(file->impSym))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So technically, it's not possible for impSym to be null, or to be anything else than a Defined here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rechecked that. In case of duplication, addImportData reports an error. However, it's possible to turn that error into a warning with -force, so it may be a null after all. I restored the null check.

impSym is already declared as DefinedImportData and as far as I can tell there is no way it can be replaced, so the cast is not needed.

syms.push_back(impSym);
if (file->impSym)
syms.push_back(file->impSym);
if (file->thunkSym && file->thunkSym->isLive())
syms.push_back(file->thunkSym);
}

sortUniqueSymbols(syms, ctx.config.imageBase);
Expand Down
11 changes: 11 additions & 0 deletions lld/test/COFF/export-imp.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; REQUIRES: x86

; RUN: llvm-lib -machine:amd64 -out:%t.imp.lib -def:%s
; RUN: lld-link -machine:amd64 -out:%t.dll %t.imp.lib -dll -noentry -export:__imp_func,DATA -map

; FileCheck %s < %t.imp.map
; CHECK: 0001:00000098 __imp_func 0000000180001098 export-imp-thunk.test.tmp.imp:imp.dll

LIBRARY imp.dll
EXPORTS
func
Loading