Skip to content

Commit e54a0a4

Browse files
committed
[llvm] manual fix-ups to IDS codemod of Analysis library
1 parent f09470c commit e54a0a4

33 files changed

+94
-78
lines changed

llvm/include/llvm/Analysis/AliasAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ class AAManager : public AnalysisInfoMixin<AAManager> {
956956
private:
957957
friend AnalysisInfoMixin<AAManager>;
958958

959-
static AnalysisKey Key;
959+
LLVM_ABI static AnalysisKey Key;
960960

961961
SmallVector<void (*)(Function &F, FunctionAnalysisManager &AM,
962962
AAResults &AAResults),

llvm/include/llvm/Analysis/AssumptionCache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class AssumptionCache {
174174
class AssumptionAnalysis : public AnalysisInfoMixin<AssumptionAnalysis> {
175175
friend AnalysisInfoMixin<AssumptionAnalysis>;
176176

177-
static AnalysisKey Key;
177+
LLVM_ABI static AnalysisKey Key;
178178

179179
public:
180180
using Result = AssumptionCache;

llvm/include/llvm/Analysis/BlockFrequencyInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class BlockFrequencyAnalysis
115115
: public AnalysisInfoMixin<BlockFrequencyAnalysis> {
116116
friend AnalysisInfoMixin<BlockFrequencyAnalysis>;
117117

118-
static AnalysisKey Key;
118+
LLVM_ABI static AnalysisKey Key;
119119

120120
public:
121121
/// Provide the result type for this analysis pass.

llvm/include/llvm/Analysis/BranchProbabilityInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ class BranchProbabilityAnalysis
426426
: public AnalysisInfoMixin<BranchProbabilityAnalysis> {
427427
friend AnalysisInfoMixin<BranchProbabilityAnalysis>;
428428

429-
static AnalysisKey Key;
429+
LLVM_ABI static AnalysisKey Key;
430430

431431
public:
432432
/// Provide the result type for this analysis pass.

llvm/include/llvm/Analysis/CGSCCPassManager.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ class Module;
109109
#define DEBUG_TYPE "cgscc"
110110

111111
/// Extern template declaration for the analysis set for this IR unit.
112-
extern template class AllAnalysesOn<LazyCallGraph::SCC>;
112+
extern template class LLVM_TEMPLATE_ABI AllAnalysesOn<LazyCallGraph::SCC>;
113113

114-
extern template class AnalysisManager<LazyCallGraph::SCC, LazyCallGraph &>;
114+
extern template class LLVM_TEMPLATE_ABI AnalysisManager<LazyCallGraph::SCC, LazyCallGraph &>;
115115

116116
/// The CGSCC analysis manager.
117117
///
@@ -204,9 +204,9 @@ CGSCCAnalysisManagerModuleProxy::run(Module &M, ModuleAnalysisManager &AM);
204204

205205
// Ensure the \c CGSCCAnalysisManagerModuleProxy is provided as an extern
206206
// template.
207-
extern template class InnerAnalysisManagerProxy<CGSCCAnalysisManager, Module>;
207+
extern template class LLVM_TEMPLATE_ABI InnerAnalysisManagerProxy<CGSCCAnalysisManager, Module>;
208208

209-
extern template class OuterAnalysisManagerProxy<
209+
extern template class LLVM_TEMPLATE_ABI OuterAnalysisManagerProxy<
210210
ModuleAnalysisManager, LazyCallGraph::SCC, LazyCallGraph &>;
211211

212212
/// A proxy from a \c ModuleAnalysisManager to an \c SCC.
@@ -402,10 +402,10 @@ class FunctionAnalysisManagerCGSCCProxy
402402
private:
403403
friend AnalysisInfoMixin<FunctionAnalysisManagerCGSCCProxy>;
404404

405-
static AnalysisKey Key;
405+
LLVM_ABI static AnalysisKey Key;
406406
};
407407

408-
extern template class OuterAnalysisManagerProxy<CGSCCAnalysisManager, Function>;
408+
extern template class LLVM_TEMPLATE_ABI OuterAnalysisManagerProxy<CGSCCAnalysisManager, Function>;
409409

410410
/// A proxy from a \c CGSCCAnalysisManager to a \c Function.
411411
using CGSCCAnalysisManagerFunctionProxy =

llvm/include/llvm/Analysis/DomTreeUpdater.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@
2323

2424
namespace llvm {
2525

26+
class DomTreeUpdater;
2627
class PostDominatorTree;
2728

29+
extern template class LLVM_TEMPLATE_ABI GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
30+
PostDominatorTree>;
31+
2832
class DomTreeUpdater
2933
: public GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
3034
PostDominatorTree> {
@@ -114,17 +118,14 @@ class DomTreeUpdater
114118
bool forceFlushDeletedBB();
115119
};
116120

117-
extern template class GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
118-
PostDominatorTree>;
119-
120-
extern template void
121+
extern template LLVM_TEMPLATE_ABI void
121122
GenericDomTreeUpdater<DomTreeUpdater, DominatorTree,
122123
PostDominatorTree>::recalculate(Function &F);
123124

124-
extern template void
125+
extern template LLVM_TEMPLATE_ABI void
125126
GenericDomTreeUpdater<DomTreeUpdater, DominatorTree, PostDominatorTree>::
126127
applyUpdatesImpl</*IsForward=*/true>();
127-
extern template void
128+
extern template LLVM_TEMPLATE_ABI void
128129
GenericDomTreeUpdater<DomTreeUpdater, DominatorTree, PostDominatorTree>::
129130
applyUpdatesImpl</*IsForward=*/false>();
130131
} // namespace llvm

llvm/include/llvm/Analysis/GlobalsModRef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class GlobalsAAResult : public AAResultBase {
128128
/// Analysis pass providing a never-invalidated alias analysis result.
129129
class GlobalsAA : public AnalysisInfoMixin<GlobalsAA> {
130130
friend AnalysisInfoMixin<GlobalsAA>;
131-
static AnalysisKey Key;
131+
LLVM_ABI static AnalysisKey Key;
132132

133133
public:
134134
typedef GlobalsAAResult Result;

llvm/include/llvm/Analysis/LastRunTrackingAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class LastRunTrackingInfo {
9191
class LastRunTrackingAnalysis final
9292
: public AnalysisInfoMixin<LastRunTrackingAnalysis> {
9393
friend AnalysisInfoMixin<LastRunTrackingAnalysis>;
94-
static AnalysisKey Key;
94+
LLVM_ABI static AnalysisKey Key;
9595

9696
public:
9797
using Result = LastRunTrackingInfo;

llvm/include/llvm/Analysis/LazyCallGraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ template <> struct GraphTraits<LazyCallGraph *> {
12601260
class LazyCallGraphAnalysis : public AnalysisInfoMixin<LazyCallGraphAnalysis> {
12611261
friend AnalysisInfoMixin<LazyCallGraphAnalysis>;
12621262

1263-
static AnalysisKey Key;
1263+
LLVM_ABI static AnalysisKey Key;
12641264

12651265
public:
12661266
/// Inform generic clients of the result type.

llvm/include/llvm/Analysis/LoopAnalysisManager.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ struct LoopStandardAnalysisResults {
6565
};
6666

6767
/// Extern template declaration for the analysis set for this IR unit.
68-
extern template class AllAnalysesOn<Loop>;
68+
extern template class LLVM_TEMPLATE_ABI AllAnalysesOn<Loop>;
6969

70-
extern template class AnalysisManager<Loop, LoopStandardAnalysisResults &>;
70+
extern template class LLVM_TEMPLATE_ABI AnalysisManager<Loop, LoopStandardAnalysisResults &>;
7171
/// The loop analysis manager.
7272
///
7373
/// See the documentation for the AnalysisManager template for detail
@@ -149,9 +149,9 @@ LoopAnalysisManagerFunctionProxy::run(Function &F, FunctionAnalysisManager &AM);
149149

150150
// Ensure the \c LoopAnalysisManagerFunctionProxy is provided as an extern
151151
// template.
152-
extern template class InnerAnalysisManagerProxy<LoopAnalysisManager, Function>;
152+
extern template class LLVM_TEMPLATE_ABI InnerAnalysisManagerProxy<LoopAnalysisManager, Function>;
153153

154-
extern template class OuterAnalysisManagerProxy<FunctionAnalysisManager, Loop,
154+
extern template class LLVM_TEMPLATE_ABI OuterAnalysisManagerProxy<FunctionAnalysisManager, Loop,
155155
LoopStandardAnalysisResults &>;
156156
/// A proxy from a \c FunctionAnalysisManager to a \c Loop.
157157
typedef OuterAnalysisManagerProxy<FunctionAnalysisManager, Loop,

0 commit comments

Comments
 (0)