Author: Jacek Caban Date: 2024-07-31T08:58:09+02:00 New Revision: 843ed4b722074466d3c462b8180b5abe25b4b7c8
URL: https://github.com/llvm/llvm-project/commit/843ed4b722074466d3c462b8180b5abe25b4b7c8 DIFF: https://github.com/llvm/llvm-project/commit/843ed4b722074466d3c462b8180b5abe25b4b7c8.diff LOG: [CodeGen][ARM64EC] Use alias symbol for exporting hybrid_patchable functions. (#100872) Exporting $hp_target symbol doesn't make sense, use the unmangled alias instead. This is not compatible with MSVC, but it makes using dllexport together with hybrid_patchable attribute possible. (cherry picked from commit 41c0f89f5532ec110b927c3a67ceac83448c5d98) Added: Modified: llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll Removed: ################################################################################ diff --git a/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp b/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp index 310b152ef9817..415edb189e60c 100644 --- a/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp +++ b/llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp @@ -833,6 +833,11 @@ bool AArch64Arm64ECCallLowering::runOnModule(Module &Mod) { "EXP+" + MangledName.value()))); A->setAliasee(&F); + if (F.hasDLLExportStorageClass()) { + A->setDLLStorageClass(GlobalValue::DLLExportStorageClass); + F.setDLLStorageClass(GlobalValue::DefaultStorageClass); + } + FnsMap[A] = GlobalAlias::create(GlobalValue::LinkOnceODRLinkage, MangledName.value(), &F); PatchableFns.insert(A); diff --git a/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll b/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll index e5387d40b9c64..64fb5b36b2c62 100644 --- a/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll +++ b/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll @@ -238,7 +238,7 @@ define dso_local void @caller() nounwind { ; CHECK-NEXT: .symidx exp ; CHECK-NEXT: .word 0 ; CHECK-NEXT: .section .drectve,"yni" -; CHECK-NEXT: .ascii " /EXPORT:\"#exp$hp_target,EXPORTAS,exp$hp_target\"" +; CHECK-NEXT: .ascii " /EXPORT:exp" ; CHECK-NEXT: .def func; ; CHECK-NEXT: .scl 2; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
