Skip to content

[LLD][COFF] Allow additional attributes in forwarding exports. #86535

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
cjacek merged 1 commit into from
Mar 26, 2024
Merged

[LLD][COFF] Allow additional attributes in forwarding exports. #86535

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
13 changes: 6 additions & 7 deletions lld/COFF/DriverUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,16 +577,15 @@ Export LinkerDriver::parseExport(StringRef arg) {
if (y.contains(".")) {
e.name = x;
e.forwardTo = y;
return e;
} else {
e.extName = x;
e.name = y;
if (e.name.empty())
goto err;
}

e.extName = x;
e.name = y;
if (e.name.empty())
goto err;
}

// If "<name>=<internalname>[,@ordinal[,NONAME]][,DATA][,PRIVATE]"
// Optional parameters "[,@ordinal[,NONAME]][,DATA][,PRIVATE]"
while (!rest.empty()) {
StringRef tok;
std::tie(tok, rest) = rest.split(",");
Expand Down
33 changes: 30 additions & 3 deletions lld/test/COFF/export.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,45 @@ SYMTAB: exportfn3 in export.test.tmp.DLL

# RUN: lld-link /out:%t.dll /dll %t.obj /export:foo=kernel32.foobar
# RUN: llvm-objdump -p %t.dll | FileCheck --check-prefix=FORWARDER %s
# RUN: llvm-nm -M %t.lib | FileCheck --check-prefix=SYMTAB-FWD %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
# RUN: lld-link /out:%t-def.dll /dll %t.obj /def:%t.def
# RUN: llvm-objdump -p %t-def.dll | FileCheck --check-prefix=FORWARDER %s
# RUN: llvm-nm -M %t-def.lib | FileCheck --check-prefix=SYMTAB-FWD %s

FORWARDER: Export Table:
FORWARDER: DLL name: export.test.tmp.dll
FORWARDER: DLL name: export.test.tmp
FORWARDER: Ordinal base: 1
FORWARDER: Ordinal RVA Name
FORWARDER: 1 0x1010 exportfn
FORWARDER: 2 foo (forwarded to kernel32.foobar)

SYMTAB-FWD: __imp_exportfn3 in export.test.tmp
SYMTAB-FWD-NEXT: __imp_foo in export.test.tmp
SYMTAB-FWD-NEXT: exportfn3 in export.test.tmp
SYMTAB-FWD-NEXT: foo in export.test.tmp

# RUN: lld-link /out:%t-fwd-priv.dll /dll %t.obj /export:foo=kernel32.foobar,DATA,PRIVATE
# RUN: llvm-objdump -p %t-fwd-priv.dll | FileCheck --check-prefix=FORWARDER %s
# RUN: llvm-nm -M %t-fwd-priv.lib | FileCheck --check-prefix=SYMTAB-FWD-PRIV %s

SYMTAB-FWD-PRIV: __imp_exportfn3 in export.test.tmp-fwd-priv
SYMTAB-FWD-PRIV-NOT: __imp_foo
SYMTAB-FWD-PRIV-NEXT: exportfn3 in export.test.tmp-fwd-priv
SYMTAB-FWD-PRIV-NOT: foo

# RUN: lld-link /out:%t-fwd-ord.dll /dll %t.obj /export:foo=kernel32.foobar,@3,NONAME
# RUN: llvm-objdump -p %t-fwd-ord.dll | FileCheck --check-prefix=FORWARDER-ORD %s
# RUN: llvm-nm -M %t-fwd-ord.lib | FileCheck --check-prefix=SYMTAB-FWD %s

FORWARDER-ORD: Export Table:
FORWARDER-ORD-NEXT: DLL name: export.test.tmp-fwd-ord
FORWARDER-ORD-NEXT: Ordinal base: 3
FORWARDER-ORD-NEXT: Ordinal RVA Name
FORWARDER-ORD-NEXT: 3 (forwarded to kernel32.foobar)
FORWARDER-ORD-NEXT: 4 0x1010 exportfn3

# 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

Expand Down