[LLD][COFF] Add support for locally imported EC symbols #114985
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow imported symbols to be recognized in both mangled and demangled forms. Support __imp_aux_ symbols in addition to __imp_ symbols.
|
Locally imported symbols are problematic on ARM64EC due to the existence of both |
|
@llvm/pr-subscribers-lld @llvm/pr-subscribers-lld-coff Author: Jacek Caban (cjacek) ChangesAllow imported symbols to be recognized in both mangled and demangled forms. Support Full diff: https://github.com/llvm/llvm-project/pull/114985.diff 2 Files Affected:
diff --git a/lld/COFF/SymbolTable.cpp b/lld/COFF/SymbolTable.cpp
index aeeebbb4e332ab..35d54d4945f7f4 100644
--- a/lld/COFF/SymbolTable.cpp
+++ b/lld/COFF/SymbolTable.cpp
@@ -501,13 +501,30 @@ bool SymbolTable::resolveRemainingUndefines() {
// If we can resolve a symbol by removing __imp_ prefix, do that.
// This odd rule is for compatibility with MSVC linker.
if (name.starts_with("__imp_")) {
- Symbol *imp = find(name.substr(strlen("__imp_")));
- if (imp) {
- // The unprefixed symbol might come later in symMap, so handle it now
- // so that the condition below can be appropriately applied.
- auto *undef = dyn_cast<Undefined>(imp);
- if (undef) {
- undef->resolveWeakAlias();
+ auto findLocalSym = [&](StringRef n) {
+ Symbol *sym = find(n);
+ if (auto undef = dyn_cast_or_null<Undefined>(sym)) {
+ // The unprefixed symbol might come later in symMap, so handle it now
+ // if needed.
+ if (!undef->resolveWeakAlias())
+ sym = nullptr;
+ }
+ return sym;
+ };
+
+ StringRef impName = name.substr(strlen("__imp_"));
+ Symbol *imp = findLocalSym(impName);
+ if (!imp && isArm64EC(ctx.config.machine)) {
+ // Try to use the mangled symbol on ARM64EC.
+ std::optional<std::string> mangledName =
+ getArm64ECMangledFunctionName(impName);
+ if (mangledName)
+ imp = findLocalSym(*mangledName);
+ if (!imp && impName.consume_front("aux_")) {
+ // If it's a __imp_aux_ symbol, try skipping the aux_ prefix.
+ imp = findLocalSym(impName);
+ if (!imp && (mangledName = getArm64ECMangledFunctionName(impName)))
+ imp = findLocalSym(*mangledName);
}
}
if (imp && imp->isLazy()) {
diff --git a/lld/test/COFF/locally-imported-arm64ec.test b/lld/test/COFF/locally-imported-arm64ec.test
new file mode 100644
index 00000000000000..9ec55c2dceaefc
--- /dev/null
+++ b/lld/test/COFF/locally-imported-arm64ec.test
@@ -0,0 +1,68 @@
+REQUIRES: aarch64
+RUN: split-file %s %t.dir && cd %t.dir
+
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows funcs.s -o funcs.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows func-mangled.s -o func-mangled.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows impsym.s -o impsym.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows impauxsym.s -o impauxsym.obj
+
+Ensure that when both mangled and demangled symbols are present, the __imp_ symbol
+resolves to the demangled symbol.
+
+RUN: lld-link -machine:arm64ec -dll -noentry funcs.obj impsym.obj -out:impsym.dll
+
+RUN: llvm-readobj --coff-basereloc impsym.dll | FileCheck --check-prefix=RELOCS %s
+RELOCS: Entry {
+RELOCS-NEXT: Type: DIR64
+RELOCS-NEXT: Address: 0x2000
+RELOCS-NEXT: }
+
+RUN: llvm-readobj --hex-dump=.test impsym.dll | FileCheck --check-prefix=TEST %s
+TEST: 0x180003000 00200000
+
+RUN: llvm-readobj --hex-dump=.rdata impsym.dll | FileCheck --check-prefix=RDATA-DEMANGLED %s
+RDATA-MANGLED: 0x180002000 00100080 01000000
+RDATA-DEMANGLED: 0x180002000 04100080 01000000
+
+
+Ensure that when both mangled and demangled symbols are present, the __imp_aux_ symbol
+resolves to the demangled symbol.
+
+RUN: lld-link -machine:arm64ec -dll -noentry funcs.obj impauxsym.obj -out:impauxsym.dll
+RUN: llvm-readobj --hex-dump=.test impauxsym.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impauxsym.dll | FileCheck --check-prefix=RDATA-DEMANGLED %s
+
+Ensure that if only the mangled symbol is present, the __imp_ symbol resolves to it.
+
+RUN: lld-link -machine:arm64ec -dll -noentry func-mangled.obj impsym.obj -out:impsym-mangled.dll
+RUN: llvm-readobj --coff-basereloc impsym-mangled.dll | FileCheck --check-prefix=RELOCS %s
+RUN: llvm-readobj --hex-dump=.test impsym-mangled.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impsym-mangled.dll | FileCheck --check-prefix=RDATA-MANGLED %s
+
+Ensure that if only the mangled symbol is present, the __imp_aux_ symbol resolves to it.
+
+RUN: lld-link -machine:arm64ec -dll -noentry func-mangled.obj impauxsym.obj -out:impauxsym-mangled.dll
+RUN: llvm-readobj --hex-dump=.test impauxsym-mangled.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impauxsym-mangled.dll | FileCheck --check-prefix=RDATA-MANGLED %s
+
+#--- funcs.s
+ .globl "#myfunc"
+"#myfunc":
+ ret
+ .text
+ .globl myfunc
+myfunc:
+ ret
+
+#--- func-mangled.s
+ .globl "#myfunc"
+"#myfunc":
+ ret
+
+#--- impsym.s
+ .section .test, "r"
+ .rva __imp_myfunc
+
+#--- impauxsym.s
+ .section .test, "r"
+ .rva __imp_aux_myfunc
|
|
@llvm/pr-subscribers-platform-windows Author: Jacek Caban (cjacek) ChangesAllow imported symbols to be recognized in both mangled and demangled forms. Support Full diff: https://github.com/llvm/llvm-project/pull/114985.diff 2 Files Affected:
diff --git a/lld/COFF/SymbolTable.cpp b/lld/COFF/SymbolTable.cpp
index aeeebbb4e332ab..35d54d4945f7f4 100644
--- a/lld/COFF/SymbolTable.cpp
+++ b/lld/COFF/SymbolTable.cpp
@@ -501,13 +501,30 @@ bool SymbolTable::resolveRemainingUndefines() {
// If we can resolve a symbol by removing __imp_ prefix, do that.
// This odd rule is for compatibility with MSVC linker.
if (name.starts_with("__imp_")) {
- Symbol *imp = find(name.substr(strlen("__imp_")));
- if (imp) {
- // The unprefixed symbol might come later in symMap, so handle it now
- // so that the condition below can be appropriately applied.
- auto *undef = dyn_cast<Undefined>(imp);
- if (undef) {
- undef->resolveWeakAlias();
+ auto findLocalSym = [&](StringRef n) {
+ Symbol *sym = find(n);
+ if (auto undef = dyn_cast_or_null<Undefined>(sym)) {
+ // The unprefixed symbol might come later in symMap, so handle it now
+ // if needed.
+ if (!undef->resolveWeakAlias())
+ sym = nullptr;
+ }
+ return sym;
+ };
+
+ StringRef impName = name.substr(strlen("__imp_"));
+ Symbol *imp = findLocalSym(impName);
+ if (!imp && isArm64EC(ctx.config.machine)) {
+ // Try to use the mangled symbol on ARM64EC.
+ std::optional<std::string> mangledName =
+ getArm64ECMangledFunctionName(impName);
+ if (mangledName)
+ imp = findLocalSym(*mangledName);
+ if (!imp && impName.consume_front("aux_")) {
+ // If it's a __imp_aux_ symbol, try skipping the aux_ prefix.
+ imp = findLocalSym(impName);
+ if (!imp && (mangledName = getArm64ECMangledFunctionName(impName)))
+ imp = findLocalSym(*mangledName);
}
}
if (imp && imp->isLazy()) {
diff --git a/lld/test/COFF/locally-imported-arm64ec.test b/lld/test/COFF/locally-imported-arm64ec.test
new file mode 100644
index 00000000000000..9ec55c2dceaefc
--- /dev/null
+++ b/lld/test/COFF/locally-imported-arm64ec.test
@@ -0,0 +1,68 @@
+REQUIRES: aarch64
+RUN: split-file %s %t.dir && cd %t.dir
+
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows funcs.s -o funcs.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows func-mangled.s -o func-mangled.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows impsym.s -o impsym.obj
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows impauxsym.s -o impauxsym.obj
+
+Ensure that when both mangled and demangled symbols are present, the __imp_ symbol
+resolves to the demangled symbol.
+
+RUN: lld-link -machine:arm64ec -dll -noentry funcs.obj impsym.obj -out:impsym.dll
+
+RUN: llvm-readobj --coff-basereloc impsym.dll | FileCheck --check-prefix=RELOCS %s
+RELOCS: Entry {
+RELOCS-NEXT: Type: DIR64
+RELOCS-NEXT: Address: 0x2000
+RELOCS-NEXT: }
+
+RUN: llvm-readobj --hex-dump=.test impsym.dll | FileCheck --check-prefix=TEST %s
+TEST: 0x180003000 00200000
+
+RUN: llvm-readobj --hex-dump=.rdata impsym.dll | FileCheck --check-prefix=RDATA-DEMANGLED %s
+RDATA-MANGLED: 0x180002000 00100080 01000000
+RDATA-DEMANGLED: 0x180002000 04100080 01000000
+
+
+Ensure that when both mangled and demangled symbols are present, the __imp_aux_ symbol
+resolves to the demangled symbol.
+
+RUN: lld-link -machine:arm64ec -dll -noentry funcs.obj impauxsym.obj -out:impauxsym.dll
+RUN: llvm-readobj --hex-dump=.test impauxsym.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impauxsym.dll | FileCheck --check-prefix=RDATA-DEMANGLED %s
+
+Ensure that if only the mangled symbol is present, the __imp_ symbol resolves to it.
+
+RUN: lld-link -machine:arm64ec -dll -noentry func-mangled.obj impsym.obj -out:impsym-mangled.dll
+RUN: llvm-readobj --coff-basereloc impsym-mangled.dll | FileCheck --check-prefix=RELOCS %s
+RUN: llvm-readobj --hex-dump=.test impsym-mangled.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impsym-mangled.dll | FileCheck --check-prefix=RDATA-MANGLED %s
+
+Ensure that if only the mangled symbol is present, the __imp_aux_ symbol resolves to it.
+
+RUN: lld-link -machine:arm64ec -dll -noentry func-mangled.obj impauxsym.obj -out:impauxsym-mangled.dll
+RUN: llvm-readobj --hex-dump=.test impauxsym-mangled.dll | FileCheck --check-prefix=TEST %s
+RUN: llvm-readobj --hex-dump=.rdata impauxsym-mangled.dll | FileCheck --check-prefix=RDATA-MANGLED %s
+
+#--- funcs.s
+ .globl "#myfunc"
+"#myfunc":
+ ret
+ .text
+ .globl myfunc
+myfunc:
+ ret
+
+#--- func-mangled.s
+ .globl "#myfunc"
+"#myfunc":
+ ret
+
+#--- impsym.s
+ .section .test, "r"
+ .rva __imp_myfunc
+
+#--- impauxsym.s
+ .section .test, "r"
+ .rva __imp_aux_myfunc
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/30/builds/9656 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow imported symbols to be recognized in both mangled and demangled forms. Support
__imp_aux_symbols in addition to__imp_symbols.