[llvm] llvm: Add missing `LLVM_ABI` annotations (PR #171629)

Fabrice de Gans via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 11 06:19:23 PST 2025


https://github.com/Steelskin updated https://github.com/llvm/llvm-project/pull/171629

>From 1543c41932af366d5c67d4a9843e1cf9cb60909b Mon Sep 17 00:00:00 2001
From: Fabroce de Gans <fabrice at thebrowser.company>
Date: Wed, 10 Dec 2025 15:46:55 +0100
Subject: [PATCH] llvm: Add missing `LLVM_ABI` annotations

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 #109483.
---
 llvm/include/llvm/CodeGen/LibcallLoweringInfo.h      | 2 +-
 llvm/include/llvm/SandboxIR/Constant.h               | 2 +-
 llvm/include/llvm/Support/Hash.h                     | 5 +++--
 llvm/include/llvm/Transforms/Utils/DebugSSAUpdater.h | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

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);



More information about the llvm-commits mailing list