[llvm] [llvm] Fix most LLVM_ABI annotations in ExecutionEngine (PR #202927)
Fabrice de Gans via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 10 03:55:28 PDT 2026
https://github.com/Steelskin created https://github.com/llvm/llvm-project/pull/202927
This updates most LLVM_ABI annotations in the ExecutionEngine headers to match expected usage:
* All public APIs should be properly annotated.
* Inlined functions should not be annotated.
These changes were done by a script fixing annotations on LLVM public headers and manually checked.
This effort is tracked in #109483.
>From c230f290b228cab1a2628ea3823e4f9a934b58d3 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <steelskin at gmail.com>
Date: Wed, 10 Jun 2026 12:54:13 +0200
Subject: [PATCH] [llvm] Fix most LLVM_ABI annotations in ExecutionEngine
This updates most LLVM_ABI annotations in the ExecutionEngine headers
to match expected usage:
* All public APIs should be properly annotated.
* Inlined functions should not be annotated.
These changes were done by a script fixing annotations on LLVM public
headers and manually checked.
This effort is tracked in #109483.
---
.../llvm/ExecutionEngine/JITLink/COFF.h | 8 ++--
.../ExecutionEngine/JITLink/COFF_x86_64.h | 9 +++--
.../JITLink/DWARFRecordSectionSplitter.h | 4 +-
.../llvm/ExecutionEngine/JITLink/ELF.h | 6 +--
.../ExecutionEngine/JITLink/ELF_aarch32.h | 7 ++--
.../ExecutionEngine/JITLink/ELF_aarch64.h | 7 ++--
.../ExecutionEngine/JITLink/ELF_hexagon.h | 7 ++--
.../ExecutionEngine/JITLink/ELF_loongarch.h | 9 +++--
.../llvm/ExecutionEngine/JITLink/ELF_ppc64.h | 13 ++++---
.../llvm/ExecutionEngine/JITLink/ELF_riscv.h | 8 ++--
.../ExecutionEngine/JITLink/ELF_systemz.h | 7 ++--
.../llvm/ExecutionEngine/JITLink/ELF_x86.h | 6 +--
.../llvm/ExecutionEngine/JITLink/ELF_x86_64.h | 6 +--
.../llvm/ExecutionEngine/JITLink/XCOFF.h | 6 +--
.../ExecutionEngine/JITLink/XCOFF_ppc64.h | 7 ++--
.../llvm/ExecutionEngine/JITLink/systemz.h | 6 +--
.../Orc/ExecutorResolutionGenerator.h | 2 +-
.../ExecutionEngine/Orc/Shared/OrcRTBridge.h | 2 +-
.../Orc/TargetProcess/ExecutorResolver.h | 2 +-
.../Orc/TargetProcess/LibraryResolver.h | 34 ++++++++--------
.../Orc/TargetProcess/LibraryScanner.h | 39 +++++++++----------
21 files changed, 102 insertions(+), 93 deletions(-)
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/COFF.h b/llvm/include/llvm/ExecutionEngine/JITLink/COFF.h
index 106bc15a86875..ce30c601bdb4f 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/COFF.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/COFF.h
@@ -23,7 +23,7 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromCOFFObject(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
@@ -31,8 +31,8 @@ createLinkGraphFromCOFFObject(MemoryBufferRef ObjectBuffer,
///
/// Uses conservative defaults for GOT and stub handling based on the target
/// platform.
-void link_COFF(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_COFF(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
/// GetImageBaseSymbol is a function object that finds the __ImageBase symbol
/// in the given graph if one is present.
@@ -43,7 +43,7 @@ class GetImageBaseSymbol {
public:
GetImageBaseSymbol(StringRef ImageBaseName = "__ImageBase")
: ImageBaseName(ImageBaseName) {}
- Symbol *operator()(LinkGraph &G);
+ LLVM_ABI Symbol *operator()(LinkGraph &G);
void reset(std::optional<Symbol *> CacheValue = std::nullopt) {
ImageBase = CacheValue;
}
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h b/llvm/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
index 2072ae9dfdbe7..f023a503db24e 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/COFF_x86_64.h
@@ -23,15 +23,16 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromCOFFObject_x86_64(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromCOFFObject_x86_64(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a COFF x86-64 object file.
-void link_COFF_x86_64(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_COFF_x86_64(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
/// Return the string name of the given COFF x86-64 edge kind.
-const char *getCOFFX86RelocationKindName(Edge::Kind R);
+LLVM_ABI const char *getCOFFX86RelocationKindName(Edge::Kind R);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.h b/llvm/include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.h
index d748d4b0fa592..6bd7c58850df6 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/DWARFRecordSectionSplitter.h
@@ -20,8 +20,8 @@ namespace jitlink {
/// without EHFrameEdgeFixer, which is responsible for adding FDE-to-CIE edges.
class DWARFRecordSectionSplitter {
public:
- DWARFRecordSectionSplitter(StringRef SectionName);
- Error operator()(LinkGraph &G);
+ LLVM_ABI DWARFRecordSectionSplitter(StringRef SectionName);
+ LLVM_ABI Error operator()(LinkGraph &G);
private:
Error processBlock(LinkGraph &G, Block &B, LinkGraph::SplitBlockCache &Cache);
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF.h
index 3decba65f380c..e2799ee847178 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF.h
@@ -23,7 +23,7 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromELFObject(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
@@ -31,8 +31,8 @@ createLinkGraphFromELFObject(MemoryBufferRef ObjectBuffer,
///
/// Uses conservative defaults for GOT and stub handling based on the target
/// platform.
-void link_ELF(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h
index b865414e520c2..ba29992667546 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch32.h
@@ -24,13 +24,14 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_aarch32(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_aarch32(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be an ELF arm/thumb object
/// file.
-void link_ELF_aarch32(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_aarch32(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
index 45a7a0100593f..8d92abacbc8a6 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_aarch64.h
@@ -25,13 +25,14 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_aarch64(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_aarch64(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF aarch64 relocatable
/// object file.
-void link_ELF_aarch64(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_aarch64(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_hexagon.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_hexagon.h
index 4a9e948382efc..f795c2f5601a7 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_hexagon.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_hexagon.h
@@ -23,13 +23,14 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_hexagon(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_hexagon(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF Hexagon relocatable
/// object file.
-void link_ELF_hexagon(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_hexagon(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h
index a8655dc6f14e3..48fa46f2faf87 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_loongarch.h
@@ -25,17 +25,18 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_loongarch(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_loongarch(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be an ELF loongarch object
/// file.
-void link_ELF_loongarch(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_loongarch(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
/// Returns a pass that performs linker relaxation. Should be added to
/// PostAllocationPasses.
-LinkGraphPassFunction createRelaxationPass_ELF_loongarch();
+LLVM_ABI LinkGraphPassFunction createRelaxationPass_ELF_loongarch();
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h
index c5049a54cdf1d..b6ce36bb19741 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_ppc64.h
@@ -24,7 +24,7 @@ namespace llvm::jitlink {
/// outlives the graph.
///
/// WARNING: The big-endian backend has not been tested yet.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromELFObject_ppc64(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
@@ -33,18 +33,19 @@ createLinkGraphFromELFObject_ppc64(MemoryBufferRef ObjectBuffer,
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_ppc64le(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_ppc64le(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF ppc64le object file.
///
/// WARNING: The big-endian backend has not been tested yet.
-void link_ELF_ppc64(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_ppc64(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
/// jit-link the given object buffer, which must be a ELF ppc64le object file.
-void link_ELF_ppc64le(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_ppc64le(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace llvm::jitlink
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_riscv.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
index d00b5c2868baf..3ab4c14cfe564 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_riscv.h
@@ -25,17 +25,17 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromELFObject_riscv(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF riscv object file.
-void link_ELF_riscv(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_riscv(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
/// Returns a pass that performs linker relaxation. Should be added to
/// PostAllocationPasses.
-LinkGraphPassFunction createRelaxationPass_ELF_riscv();
+LLVM_ABI LinkGraphPassFunction createRelaxationPass_ELF_riscv();
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_systemz.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_systemz.h
index a996dfd9543df..d7e7f227c6b94 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_systemz.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_systemz.h
@@ -25,13 +25,14 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromELFObject_systemz(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromELFObject_systemz(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF systemz relocatable
/// object file.
-void link_ELF_systemz(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_systemz(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86.h
index 82151f93a00bc..06ea1b88f65a4 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86.h
@@ -25,14 +25,14 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromELFObject_x86(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF x86 relocatable
/// object file.
-void link_ELF_x86(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_x86(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
index c4f2c532de745..5a40828e25cb4 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h
@@ -23,13 +23,13 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromELFObject_x86_64(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a ELF x86-64 object file.
-void link_ELF_x86_64(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_ELF_x86_64(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace jitlink
} // end namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF.h b/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF.h
index 3d181d0786eb7..dff1e1941c453 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF.h
@@ -23,13 +23,13 @@ namespace jitlink {
/// Note: The graph does not take ownership of the underlying buffer, nor copy
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
-Expected<std::unique_ptr<LinkGraph>>
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
createLinkGraphFromXCOFFObject(MemoryBufferRef ObjectBuffer,
std::shared_ptr<orc::SymbolStringPool> SSP);
/// Link the given graph.
-void link_XCOFF(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_XCOFF(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // namespace jitlink
} // namespace llvm
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h b/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h
index ec5c8a37bda27..a82661de7f108 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/XCOFF_ppc64.h
@@ -24,13 +24,14 @@ namespace llvm::jitlink {
/// its contents. The caller is responsible for ensuring that the object buffer
/// outlives the graph.
///
-Expected<std::unique_ptr<LinkGraph>> createLinkGraphFromXCOFFObject_ppc64(
+LLVM_ABI Expected<std::unique_ptr<LinkGraph>>
+createLinkGraphFromXCOFFObject_ppc64(
MemoryBufferRef ObjectBuffer, std::shared_ptr<orc::SymbolStringPool> SSP);
/// jit-link the given object buffer, which must be a XCOFF ppc64 object file.
///
-void link_XCOFF_ppc64(std::unique_ptr<LinkGraph> G,
- std::unique_ptr<JITLinkContext> Ctx);
+LLVM_ABI void link_XCOFF_ppc64(std::unique_ptr<LinkGraph> G,
+ std::unique_ptr<JITLinkContext> Ctx);
} // end namespace llvm::jitlink
diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/systemz.h b/llvm/include/llvm/ExecutionEngine/JITLink/systemz.h
index 8804981775fa8..efc1bda8edda6 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/systemz.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/systemz.h
@@ -554,7 +554,7 @@ enum EdgeKind_systemz : Edge::Kind {
/// Returns a string name for the given systemz edge. For debugging purposes
/// only
-const char *getEdgeKindName(Edge::Kind K);
+LLVM_ABI const char *getEdgeKindName(Edge::Kind K);
/// Apply fixup expression for edge to block content.
inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
@@ -764,7 +764,7 @@ inline Error applyFixup(LinkGraph &G, Block &B, const Edge &E,
}
/// SystemZ null pointer content.
-extern const char NullPointerContent[8];
+extern const LLVM_ABI char NullPointerContent[8];
inline ArrayRef<char> getGOTEntryBlockContent(LinkGraph &G) {
return {reinterpret_cast<const char *>(NullPointerContent),
G.getPointerSize()};
@@ -777,7 +777,7 @@ inline ArrayRef<char> getGOTEntryBlockContent(LinkGraph &G) {
/// lgrl %r1, ptr
/// j %r1
constexpr size_t StubEntrySize = 8;
-extern const char Pointer64JumpStubContent[StubEntrySize];
+extern const LLVM_ABI char Pointer64JumpStubContent[StubEntrySize];
inline ArrayRef<char> getStubBlockContent(LinkGraph &G) {
auto StubContent = Pointer64JumpStubContent;
return {reinterpret_cast<const char *>(StubContent), StubEntrySize};
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h b/llvm/include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h
index d427dd6d77008..194165f36808f 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/ExecutorResolutionGenerator.h
@@ -22,7 +22,7 @@
namespace llvm::orc {
-class ExecutorResolutionGenerator : public DefinitionGenerator {
+class LLVM_ABI ExecutorResolutionGenerator : public DefinitionGenerator {
public:
using SymbolPredicate = unique_function<bool(const SymbolStringPtr &)>;
using AbsoluteSymbolsFn =
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
index 90a89c256208d..b7722156a364b 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h
@@ -77,7 +77,7 @@ struct SimpleExecutorMemoryManagerSymbolNames {
/// Default symbol names for the ORC runtime's SimpleNativeMemoryMap SPS
/// interface.
-extern const SimpleExecutorMemoryManagerSymbolNames
+extern const LLVM_ABI SimpleExecutorMemoryManagerSymbolNames
orc_rt_SimpleNativeMemoryMapSPSSymbols;
/// Symbol names for dylib management implementation.
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorResolver.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorResolver.h
index fe1c84928a95a..a77604678d8c3 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorResolver.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorResolver.h
@@ -32,7 +32,7 @@ class ExecutorResolver {
YieldResolveResultFn &&OnResolve) = 0;
};
-class DylibSymbolResolver : public ExecutorResolver {
+class LLVM_ABI DylibSymbolResolver : public ExecutorResolver {
public:
DylibSymbolResolver(tpctypes::DylibHandle H) : Handle(H) {}
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryResolver.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryResolver.h
index 045d259d4ecbb..cb8fe4b24a95d 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryResolver.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryResolver.h
@@ -386,10 +386,11 @@ class LibraryResolver {
using OnEachSymbolFn = std::function<EnumerateResult(StringRef Sym)>;
- static bool enumerateSymbols(object::ObjectFile *Obj, OnEachSymbolFn OnEach,
- const SymbolEnumeratorOptions &Opts);
- static bool enumerateSymbols(StringRef Path, OnEachSymbolFn OnEach,
- const SymbolEnumeratorOptions &Opts);
+ LLVM_ABI static bool enumerateSymbols(object::ObjectFile *Obj,
+ OnEachSymbolFn OnEach,
+ const SymbolEnumeratorOptions &Opts);
+ LLVM_ABI static bool enumerateSymbols(StringRef Path, OnEachSymbolFn OnEach,
+ const SymbolEnumeratorOptions &Opts);
};
/// Tracks a set of symbols and the libraries where they are resolved.
@@ -515,7 +516,7 @@ class LibraryResolver {
};
LibraryResolver() = delete;
- explicit LibraryResolver(const Setup &S);
+ LLVM_ABI explicit LibraryResolver(const Setup &S);
~LibraryResolver() = default;
using OnSearchComplete = unique_function<void(SymbolQuery &)>;
@@ -533,12 +534,13 @@ class LibraryResolver {
});
}
- void searchSymbolsInLibraries(ArrayRef<StringRef> SymList,
- OnSearchComplete OnComplete,
- const SearchConfig &Config = SearchConfig());
+ LLVM_ABI void
+ searchSymbolsInLibraries(ArrayRef<StringRef> SymList,
+ OnSearchComplete OnComplete,
+ const SearchConfig &Config = SearchConfig());
private:
- bool scanLibrariesIfNeeded(PathType K, size_t BatchSize = 0);
+ LLVM_ABI bool scanLibrariesIfNeeded(PathType K, size_t BatchSize = 0);
bool scanForNewLibraries(PathType K, LibraryCursor &Cur);
void resolveSymbolsInLibrary(LibraryInfo *Lib, SymbolQuery &Q,
const SymbolEnumeratorOptions &Opts);
@@ -558,12 +560,12 @@ using EnumerateResult = SymbolEnumerator::EnumerateResult;
class LibraryResolutionDriver {
public:
- static std::unique_ptr<LibraryResolutionDriver>
+ LLVM_ABI static std::unique_ptr<LibraryResolutionDriver>
create(const LibraryResolver::Setup &S);
- void addScanPath(const std::string &Path, PathType Kind);
- void markLibraryLoaded(StringRef Path);
- void markLibraryUnLoaded(StringRef Path);
+ LLVM_ABI void addScanPath(const std::string &Path, PathType Kind);
+ LLVM_ABI void markLibraryLoaded(StringRef Path);
+ LLVM_ABI void markLibraryUnLoaded(StringRef Path);
bool isLibraryLoaded(StringRef Path) const {
return LR->LibMgr.isLoaded(Path);
}
@@ -583,9 +585,9 @@ class LibraryResolutionDriver {
LR->scanLibrariesIfNeeded(PK, BatchSize);
}
- void resolveSymbols(ArrayRef<StringRef> Symbols,
- LibraryResolver::OnSearchComplete OnCompletion,
- const SearchConfig &Config = SearchConfig());
+ LLVM_ABI void resolveSymbols(ArrayRef<StringRef> Symbols,
+ LibraryResolver::OnSearchComplete OnCompletion,
+ const SearchConfig &Config = SearchConfig());
~LibraryResolutionDriver() = default;
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryScanner.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryScanner.h
index abfcbee1d2e5c..dff659944e38d 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryScanner.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/LibraryScanner.h
@@ -155,10 +155,9 @@ class PathResolver {
mode_t lstatCached(StringRef Path);
std::optional<std::string> readlinkCached(StringRef Path);
#endif
- std::optional<std::string> realpathCached(StringRef Path, std::error_code &ec,
- StringRef base = "",
- bool baseIsResolved = false,
- long symloopLevel = 40);
+ LLVM_ABI std::optional<std::string>
+ realpathCached(StringRef Path, std::error_code &ec, StringRef base = "",
+ bool baseIsResolved = false, long symloopLevel = 40);
};
/// Performs placeholder substitution in dynamic library paths.
@@ -167,7 +166,7 @@ class PathResolver {
/// in input paths with their resolved values.
class DylibSubstitutor {
public:
- void configure(StringRef loaderPath);
+ LLVM_ABI void configure(StringRef loaderPath);
std::string substitute(StringRef input) const {
for (const auto &[ph, value] : Placeholders) {
@@ -219,14 +218,14 @@ class ObjectFileLoader {
return *Obj.getBinary();
}
- static bool isArchitectureCompatible(const object::ObjectFile &Obj);
+ LLVM_ABI static bool isArchitectureCompatible(const object::ObjectFile &Obj);
private:
object::OwningBinary<object::ObjectFile> Obj;
Error Err = Error::success();
bool ErrorTaken = false;
- static Expected<object::OwningBinary<object::ObjectFile>>
+ LLVM_ABI static Expected<object::OwningBinary<object::ObjectFile>>
loadObjectFileWithOwnership(StringRef FilePath);
};
@@ -265,7 +264,7 @@ class DylibPathValidator {
ObjFileCache *ObjCache = nullptr)
: LibPathResolver(PR), LibPathCache(LC), ObjCache(ObjCache) {}
- bool isSharedLibrary(StringRef Path) const;
+ LLVM_ABI bool isSharedLibrary(StringRef Path) const;
bool isSharedLibraryCached(StringRef Path) const {
if (LibPathCache.hasSeen(Path))
return true;
@@ -322,9 +321,9 @@ class SearchPathResolver {
Paths.emplace_back(path.str());
}
- std::optional<std::string> resolve(StringRef libStem,
- const DylibSubstitutor &Subst,
- DylibPathValidator &Validator) const;
+ LLVM_ABI std::optional<std::string>
+ resolve(StringRef libStem, const DylibSubstitutor &Subst,
+ DylibPathValidator &Validator) const;
SearchPathType searchPathType() const { return Kind; }
private:
@@ -340,8 +339,8 @@ class DylibResolverImpl {
: Substitutor(std::move(Substitutor)), Validator(Validator),
Resolvers(std::move(Resolvers)) {}
- std::optional<std::string> resolve(StringRef Stem,
- bool VariateLibStem = false) const;
+ LLVM_ABI std::optional<std::string>
+ resolve(StringRef Stem, bool VariateLibStem = false) const;
private:
std::optional<std::string> tryWithExtensions(StringRef libstem) const;
@@ -420,18 +419,18 @@ class LibraryScanHelper {
addBasePath(p);
}
- void
+ LLVM_ABI void
addBasePath(const std::string &P,
PathType Kind =
PathType::Unknown); // Add a canonical directory for scanning
- void getNextBatch(PathType Kind, size_t batchSize,
- SmallVectorImpl<const LibrarySearchPath *> &Out);
+ LLVM_ABI void getNextBatch(PathType Kind, size_t batchSize,
+ SmallVectorImpl<const LibrarySearchPath *> &Out);
- bool leftToScan(PathType K) const;
- void resetToScan();
+ LLVM_ABI bool leftToScan(PathType K) const;
+ LLVM_ABI void resetToScan();
- bool isTrackedBasePath(StringRef P) const;
+ LLVM_ABI bool isTrackedBasePath(StringRef P) const;
bool hasSearchPath() const { return !LibSearchPaths.empty(); }
SmallVector<StringRef> getSearchPaths() const {
@@ -480,7 +479,7 @@ class LibraryScanner {
&ObjCache),
ShouldScanCall(std::move(ShouldScanCall)) {}
- void scanNext(PathType Kind, size_t batchSize = 1);
+ LLVM_ABI void scanNext(PathType Kind, size_t batchSize = 1);
/// Dependency info for a library.
struct LibraryDepsInfo {
More information about the llvm-commits
mailing list