[llvm] manual fixups to export annotations

Author: andrurogerz

llvm/include/llvm/Analysis/AliasAnalysis.h

@@ -147,7 +147,7 @@ LLVM_ABI raw_ostream &operator<<(raw_ostream &OS, AliasResult AR);
 
 /// Virtual base class for providers of capture analysis.
 struct CaptureAnalysis {
-  virtual ~CaptureAnalysis() = 0;
+  LLVM_ABI virtual ~CaptureAnalysis() = 0;
 
   /// Check whether Object is not captured before instruction I. If OrAt is
   /// true, captures by instruction I itself are also considered.
@@ -160,12 +160,14 @@ struct CaptureAnalysis {
 /// Context-free CaptureAnalysis provider, which computes and caches whether an
 /// object is captured in the function at all, but does not distinguish whether
 /// it was captured before or after the context instruction.
-class SimpleCaptureAnalysis final : public CaptureAnalysis {
+class LLVM_ABI SimpleCaptureAnalysis final : public CaptureAnalysis {
   SmallDenseMap<const Value *, bool, 8> IsCapturedCache;
 
 public:
-  LLVM_ABI bool isNotCapturedBefore(const Value *Object, const Instruction *I,
-                                    bool OrAt) override;
+  ~SimpleCaptureAnalysis() = default;
+
+  bool isNotCapturedBefore(const Value *Object, const Instruction *I,
+                           bool OrAt) override;
 };
 
 /// Context-sensitive CaptureAnalysis provider, which computes and caches the
@@ -189,6 +191,8 @@ class EarliestEscapeAnalysis final : public CaptureAnalysis {
   EarliestEscapeAnalysis(DominatorTree &DT, const LoopInfo *LI = nullptr)
       : DT(DT), LI(LI) {}
 
+  LLVM_ABI ~EarliestEscapeAnalysis() = default;
+
   LLVM_ABI bool isNotCapturedBefore(const Value *Object, const Instruction *I,
                                     bool OrAt) override;
 
@@ -725,7 +729,7 @@ using AliasAnalysis = AAResults;
 /// All of these methods model methods by the same name in the \c
 /// AAResults class. Only differences and specifics to how the
 /// implementations are called are documented here.
-class AAResults::Concept {
+class LLVM_ABI AAResults::Concept {
 public:
   virtual ~Concept() = 0;
 
@@ -973,7 +977,7 @@ class AAManager : public AnalysisInfoMixin<AAManager> {
 private:
   friend AnalysisInfoMixin<AAManager>;
 
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 
   SmallVector<void (*)(Function &F, FunctionAnalysisManager &AM,
                        AAResults &AAResults),

llvm/include/llvm/Analysis/AssumptionCache.h

@@ -70,8 +70,8 @@ class AssumptionCache {
   class AffectedValueCallbackVH final : public CallbackVH {
     AssumptionCache *AC;
 
-    void deleted() override;
-    void allUsesReplacedWith(Value *) override;
+    LLVM_ABI void deleted() override;
+    LLVM_ABI void allUsesReplacedWith(Value *) override;
 
   public:
     using DMI = DenseMapInfo<Value *>;
@@ -102,7 +102,7 @@ class AssumptionCache {
   bool Scanned = false;
 
   /// Scan the function for assumptions and add them to the cache.
-  void scanFunction();
+  LLVM_ABI void scanFunction();
 
 public:
   /// Construct an AssumptionCache from a function by scanning all of
@@ -174,7 +174,7 @@ class AssumptionCache {
 class AssumptionAnalysis : public AnalysisInfoMixin<AssumptionAnalysis> {
   friend AnalysisInfoMixin<AssumptionAnalysis>;
 
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 
 public:
   using Result = AssumptionCache;

llvm/include/llvm/Analysis/BlockFrequencyInfo.h

@@ -120,7 +120,7 @@ class BlockFrequencyAnalysis
     : public AnalysisInfoMixin<BlockFrequencyAnalysis> {
   friend AnalysisInfoMixin<BlockFrequencyAnalysis>;
 
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 
 public:
   /// Provide the result type for this analysis pass.

llvm/include/llvm/Analysis/BranchProbabilityInfo.h

@@ -428,7 +428,7 @@ class BranchProbabilityAnalysis
     : public AnalysisInfoMixin<BranchProbabilityAnalysis> {
   friend AnalysisInfoMixin<BranchProbabilityAnalysis>;
 
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 
 public:
   /// Provide the result type for this analysis pass.

llvm/include/llvm/Analysis/CGSCCPassManager.h

@@ -109,9 +109,10 @@ class Module;
 #define DEBUG_TYPE "cgscc"
 
 /// Extern template declaration for the analysis set for this IR unit.
-extern template class AllAnalysesOn<LazyCallGraph::SCC>;
+extern template class LLVM_TEMPLATE_ABI AllAnalysesOn<LazyCallGraph::SCC>;
 
-extern template class AnalysisManager<LazyCallGraph::SCC, LazyCallGraph &>;
+extern template class LLVM_TEMPLATE_ABI
+    AnalysisManager<LazyCallGraph::SCC, LazyCallGraph &>;
 
 /// The CGSCC analysis manager.
 ///
@@ -204,9 +205,10 @@ CGSCCAnalysisManagerModuleProxy::run(Module &M, ModuleAnalysisManager &AM);
 
 // Ensure the \c CGSCCAnalysisManagerModuleProxy is provided as an extern
 // template.
-extern template class InnerAnalysisManagerProxy<CGSCCAnalysisManager, Module>;
+extern template class LLVM_TEMPLATE_ABI
+    InnerAnalysisManagerProxy<CGSCCAnalysisManager, Module>;
 
-extern template class OuterAnalysisManagerProxy<
+extern template class LLVM_TEMPLATE_ABI OuterAnalysisManagerProxy<
     ModuleAnalysisManager, LazyCallGraph::SCC, LazyCallGraph &>;
 
 /// A proxy from a \c ModuleAnalysisManager to an \c SCC.
@@ -403,10 +405,11 @@ class FunctionAnalysisManagerCGSCCProxy
 private:
   friend AnalysisInfoMixin<FunctionAnalysisManagerCGSCCProxy>;
 
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 };
 
-extern template class OuterAnalysisManagerProxy<CGSCCAnalysisManager, Function>;
+extern template class LLVM_TEMPLATE_ABI
+    OuterAnalysisManagerProxy<CGSCCAnalysisManager, Function>;
 
 /// A proxy from a \c CGSCCAnalysisManager to a \c Function.
 using CGSCCAnalysisManagerFunctionProxy =

llvm/include/llvm/Analysis/ConstantFolding.h

@@ -20,6 +20,7 @@
 #define LLVM_ANALYSIS_CONSTANTFOLDING_H
 
 #include "llvm/Support/Compiler.h"
+
 #include <stdint.h>
 
 namespace llvm {

llvm/include/llvm/Analysis/DomTreeUpdater.h

@@ -23,8 +23,12 @@
 
 namespace llvm {
 
+class DomTreeUpdater;
 class PostDominatorTree;
 
+extern template class LLVM_TEMPLATE_ABI
+    GenericDomTreeUpdater<DomTreeUpdater, DominatorTree, PostDominatorTree>;
+
 class DomTreeUpdater
     : public GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
                                    PostDominatorTree> {
@@ -114,17 +118,14 @@ class DomTreeUpdater
   bool forceFlushDeletedBB();
 };
 
-extern template class GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
-                                            PostDominatorTree>;
-
-extern template void
+extern template LLVM_TEMPLATE_ABI void
 GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
                       PostDominatorTree>::recalculate(Function &F);
 
-extern template void
+extern template LLVM_TEMPLATE_ABI void
 GenericDomTreeUpdater<DomTreeUpdater, DominatorTree, PostDominatorTree>::
     applyUpdatesImpl</*IsForward=*/true>();
-extern template void
+extern template LLVM_TEMPLATE_ABI void
 GenericDomTreeUpdater<DomTreeUpdater, DominatorTree, PostDominatorTree>::
     applyUpdatesImpl</*IsForward=*/false>();
 } // namespace llvm

llvm/include/llvm/Analysis/EphemeralValuesCache.h

@@ -31,7 +31,7 @@ class EphemeralValuesCache {
   AssumptionCache ∾
   bool Collected = false;
 
-  void collectEphemeralValues();
+  LLVM_ABI void collectEphemeralValues();
 
 public:
   EphemeralValuesCache(Function &F, AssumptionCache &AC) : F(F), AC(AC) {}

llvm/include/llvm/Analysis/FunctionPropertiesAnalysis.h

@@ -186,8 +186,9 @@ class FunctionPropertiesUpdater {
   BasicBlock &CallSiteBB;
   Function &Caller;
 
-  static bool isUpdateValid(Function &F, const FunctionPropertiesInfo &FPI,
-                            FunctionAnalysisManager &FAM);
+  LLVM_ABI static bool isUpdateValid(Function &F,
+                                     const FunctionPropertiesInfo &FPI,
+                                     FunctionAnalysisManager &FAM);
 
   DominatorTree &getUpdatedDominatorTree(FunctionAnalysisManager &FAM) const;
 

llvm/include/llvm/Analysis/GlobalsModRef.h

@@ -130,7 +130,7 @@ class GlobalsAAResult : public AAResultBase {
 /// Analysis pass providing a never-invalidated alias analysis result.
 class GlobalsAA : public AnalysisInfoMixin<GlobalsAA> {
   friend AnalysisInfoMixin<GlobalsAA>;
-  static AnalysisKey Key;
+  LLVM_ABI static AnalysisKey Key;
 
 public:
   typedef GlobalsAAResult Result;