llvm: Add missing LLVM_ABI annotations
#171629
Merged
+8
−6
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
llvmbot
added
debuginfo
llvm:support
llvm:analysis
Member
|
@llvm/pr-subscribers-debuginfo @llvm/pr-subscribers-llvm-support Author: Fabrice de Gans (Steelskin) ChangesThis patch updates various LLVM headers to properly add the This effort is tracked in #109483. Full diff: https://github.com/llvm/llvm-project/pull/171629.diff 5 Files Affected:
diff --git a/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h b/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
index 609568ebc21a8..da17e4bdc749a 100644
--- a/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
+++ b/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
@@ -22,18 +22,19 @@ class LLVM_ABI RuntimeLibraryAnalysis
RuntimeLibraryAnalysis() = default;
RuntimeLibraryAnalysis(RTLIB::RuntimeLibcallsInfo &&BaselineInfoImpl)
: LibcallsInfo(std::move(BaselineInfoImpl)) {}
- RuntimeLibraryAnalysis(
+ LLVM_ABI RuntimeLibraryAnalysis(
const Triple &TT,
ExceptionHandling ExceptionModel = ExceptionHandling::None,
FloatABI::ABIType FloatABI = FloatABI::Default,
EABI EABIVersion = EABI::Default, StringRef ABIName = "",
VectorLibrary VecLib = VectorLibrary::NoLibrary);
- RTLIB::RuntimeLibcallsInfo run(const Module &M, ModuleAnalysisManager &);
+ LLVM_ABI RTLIB::RuntimeLibcallsInfo run(const Module &M,
+ ModuleAnalysisManager &);
private:
friend AnalysisInfoMixin<RuntimeLibraryAnalysis>;
- static AnalysisKey Key;
+ LLVM_ABI static AnalysisKey Key;
std::optional<RTLIB::RuntimeLibcallsInfo> LibcallsInfo;
};
diff --git a/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h b/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
index 3e0137710e8eb..13225c072cf78 100644
--- a/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
+++ b/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
@@ -110,7 +110,7 @@ class LibcallLoweringModuleAnalysis
: public AnalysisInfoMixin<LibcallLoweringModuleAnalysis> {
private:
friend AnalysisInfoMixin<LibcallLoweringModuleAnalysis>;
- static AnalysisKey Key;
+ LLVM_ABI static AnalysisKey Key;
LibcallLoweringModuleAnalysisResult LibcallLoweringMap;
diff --git a/llvm/include/llvm/SandboxIR/Constant.h b/llvm/include/llvm/SandboxIR/Constant.h
index 2fe923f6c3866..c9ceba2dabed3 100644
--- a/llvm/include/llvm/SandboxIR/Constant.h
+++ b/llvm/include/llvm/SandboxIR/Constant.h
@@ -1379,7 +1379,7 @@ class ConstantPtrAuth final : public Constant {
/// the only global-initializer user of the ptrauth signed pointer.
LLVM_ABI Constant *getAddrDiscriminator() const;
- Constant *getDeactivationSymbol() const;
+ LLVM_ABI_FOR_TEST Constant *getDeactivationSymbol() const;
/// Whether there is any non-null address discriminator.
bool hasAddressDiscriminator() const {
diff --git a/llvm/include/llvm/Support/Hash.h b/llvm/include/llvm/Support/Hash.h
index bf98f0dcef836..f30a2597a9b30 100644
--- a/llvm/include/llvm/Support/Hash.h
+++ b/llvm/include/llvm/Support/Hash.h
@@ -25,11 +25,12 @@ enum class KCFIHashAlgorithm { xxHash64, FNV1a };
KCFIHashAlgorithm parseKCFIHashAlgorithm(StringRef Name);
/// Convert a KCFI hash algorithm enum to its string representation.
-StringRef stringifyKCFIHashAlgorithm(KCFIHashAlgorithm Algorithm);
+LLVM_ABI StringRef stringifyKCFIHashAlgorithm(KCFIHashAlgorithm Algorithm);
/// Compute KCFI type ID from mangled type name.
/// The algorithm can be xxHash64 or FNV-1a.
-uint32_t getKCFITypeID(StringRef MangledTypeName, KCFIHashAlgorithm Algorithm);
+LLVM_ABI uint32_t getKCFITypeID(StringRef MangledTypeName,
+ KCFIHashAlgorithm Algorithm);
} // end namespace llvm
diff --git a/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h b/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
index 2d25ce3245793..3d88df91c2da5 100644
--- a/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
+++ b/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
@@ -29,6 +29,7 @@
#include "llvm/IR/Instruction.h"
#include "llvm/IR/ValueHandle.h"
#include "llvm/IR/ValueMap.h"
+#include "llvm/Support/Compiler.h"
#include <cstdint>
namespace llvm {
@@ -342,7 +343,7 @@ class DbgValueRangeTable {
DenseMap<DebugVariableAggregate, DbgValueDef> OrigSingleLocVariableValueTable;
public:
- void addVariable(Function *F, DebugVariableAggregate DVA);
+ LLVM_ABI_FOR_TEST void addVariable(Function *F, DebugVariableAggregate DVA);
bool hasVariableEntry(DebugVariableAggregate DVA) const {
return OrigVariableValueRangeTable.contains(DVA) ||
OrigSingleLocVariableValueTable.contains(DVA);
|
Member
|
@llvm/pr-subscribers-llvm-analysis Author: Fabrice de Gans (Steelskin) ChangesThis patch updates various LLVM headers to properly add the This effort is tracked in #109483. Full diff: https://github.com/llvm/llvm-project/pull/171629.diff 5 Files Affected:
diff --git a/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h b/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
index 609568ebc21a8..da17e4bdc749a 100644
--- a/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
+++ b/llvm/include/llvm/Analysis/RuntimeLibcallInfo.h
@@ -22,18 +22,19 @@ class LLVM_ABI RuntimeLibraryAnalysis
RuntimeLibraryAnalysis() = default;
RuntimeLibraryAnalysis(RTLIB::RuntimeLibcallsInfo &&BaselineInfoImpl)
: LibcallsInfo(std::move(BaselineInfoImpl)) {}
- RuntimeLibraryAnalysis(
+ LLVM_ABI RuntimeLibraryAnalysis(
const Triple &TT,
ExceptionHandling ExceptionModel = ExceptionHandling::None,
FloatABI::ABIType FloatABI = FloatABI::Default,
EABI EABIVersion = EABI::Default, StringRef ABIName = "",
VectorLibrary VecLib = VectorLibrary::NoLibrary);
- RTLIB::RuntimeLibcallsInfo run(const Module &M, ModuleAnalysisManager &);
+ LLVM_ABI RTLIB::RuntimeLibcallsInfo run(const Module &M,
+ ModuleAnalysisManager &);
private:
friend AnalysisInfoMixin<RuntimeLibraryAnalysis>;
- static AnalysisKey Key;
+ LLVM_ABI static AnalysisKey Key;
std::optional<RTLIB::RuntimeLibcallsInfo> LibcallsInfo;
};
diff --git a/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h b/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
index 3e0137710e8eb..13225c072cf78 100644
--- a/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
+++ b/llvm/include/llvm/CodeGen/LibcallLoweringInfo.h
@@ -110,7 +110,7 @@ class LibcallLoweringModuleAnalysis
: public AnalysisInfoMixin<LibcallLoweringModuleAnalysis> {
private:
friend AnalysisInfoMixin<LibcallLoweringModuleAnalysis>;
- static AnalysisKey Key;
+ LLVM_ABI static AnalysisKey Key;
LibcallLoweringModuleAnalysisResult LibcallLoweringMap;
diff --git a/llvm/include/llvm/SandboxIR/Constant.h b/llvm/include/llvm/SandboxIR/Constant.h
index 2fe923f6c3866..c9ceba2dabed3 100644
--- a/llvm/include/llvm/SandboxIR/Constant.h
+++ b/llvm/include/llvm/SandboxIR/Constant.h
@@ -1379,7 +1379,7 @@ class ConstantPtrAuth final : public Constant {
/// the only global-initializer user of the ptrauth signed pointer.
LLVM_ABI Constant *getAddrDiscriminator() const;
- Constant *getDeactivationSymbol() const;
+ LLVM_ABI_FOR_TEST Constant *getDeactivationSymbol() const;
/// Whether there is any non-null address discriminator.
bool hasAddressDiscriminator() const {
diff --git a/llvm/include/llvm/Support/Hash.h b/llvm/include/llvm/Support/Hash.h
index bf98f0dcef836..f30a2597a9b30 100644
--- a/llvm/include/llvm/Support/Hash.h
+++ b/llvm/include/llvm/Support/Hash.h
@@ -25,11 +25,12 @@ enum class KCFIHashAlgorithm { xxHash64, FNV1a };
KCFIHashAlgorithm parseKCFIHashAlgorithm(StringRef Name);
/// Convert a KCFI hash algorithm enum to its string representation.
-StringRef stringifyKCFIHashAlgorithm(KCFIHashAlgorithm Algorithm);
+LLVM_ABI StringRef stringifyKCFIHashAlgorithm(KCFIHashAlgorithm Algorithm);
/// Compute KCFI type ID from mangled type name.
/// The algorithm can be xxHash64 or FNV-1a.
-uint32_t getKCFITypeID(StringRef MangledTypeName, KCFIHashAlgorithm Algorithm);
+LLVM_ABI uint32_t getKCFITypeID(StringRef MangledTypeName,
+ KCFIHashAlgorithm Algorithm);
} // end namespace llvm
diff --git a/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h b/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
index 2d25ce3245793..3d88df91c2da5 100644
--- a/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
+++ b/llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h
@@ -29,6 +29,7 @@
#include "llvm/IR/Instruction.h"
#include "llvm/IR/ValueHandle.h"
#include "llvm/IR/ValueMap.h"
+#include "llvm/Support/Compiler.h"
#include <cstdint>
namespace llvm {
@@ -342,7 +343,7 @@ class DbgValueRangeTable {
DenseMap<DebugVariableAggregate, DbgValueDef> OrigSingleLocVariableValueTable;
public:
- void addVariable(Function *F, DebugVariableAggregate DVA);
+ LLVM_ABI_FOR_TEST void addVariable(Function *F, DebugVariableAggregate DVA);
bool hasVariableEntry(DebugVariableAggregate DVA) const {
return OrigVariableValueRangeTable.contains(DVA) ||
OrigSingleLocVariableValueTable.contains(DVA);
|
nikic
reviewed
Dec 10, 2025
nikic
reviewed
Dec 10, 2025
Steelskin
force-pushed
the
fabrice/upstream-llvm-abi-annotations-4
branch
from
7c29522 to
1543c41
Compare
This patch updates various LLVM headers to properly add the `LLVM_ABI` and `LLVM_ABI_FOR_TEST` annotations to build LLVM as a DLL on Windows. This effort is tracked in llvm#109483.
Steelskin
force-pushed
the
fabrice/upstream-llvm-abi-annotations-4
branch
from
1543c41 to
e98834c
Compare
Co-authored-by: Nikita Popov <github@npopov.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This patch updates various LLVM headers to properly add the
LLVM_ABIandLLVM_ABI_FOR_TESTannotations to build LLVM as a DLL on Windows.This effort is tracked in #109483.