Skip to content

Commit a9f9005

Browse files
committed
X86: Consistently declare pass initializers in X86.h; NFC
This avoids declaring them twice: in X86TargetMachine.cpp and the file implementing the pass. llvm-svn: 345801
1 parent 35e4c84 commit a9f9005

10 files changed

+13
-55
lines changed

llvm/lib/Target/X86/ShadowCallStack.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131

3232
using namespace llvm;
3333

34-
namespace llvm {
35-
void initializeShadowCallStackPass(PassRegistry &);
36-
}
37-
3834
namespace {
3935

4036
class ShadowCallStack : public MachineFunctionPass {

llvm/lib/Target/X86/X86.h

+13-4
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ FunctionPass *createX86FixupBWInsts();
115115
/// to another, when profitable.
116116
FunctionPass *createX86DomainReassignmentPass();
117117

118-
void initializeFixupBWInstPassPass(PassRegistry &);
119-
120118
/// This pass replaces EVEX encoded of AVX-512 instructiosn by VEX
121119
/// encoding when possible in order to reduce code size.
122120
FunctionPass *createX86EvexToVexInsts();
@@ -128,10 +126,21 @@ InstructionSelector *createX86InstructionSelector(const X86TargetMachine &TM,
128126
X86Subtarget &,
129127
X86RegisterBankInfo &);
130128

131-
void initializeEvexToVexInstPassPass(PassRegistry &);
132-
133129
FunctionPass *createX86SpeculativeLoadHardeningPass();
134130

131+
void initializeEvexToVexInstPassPass(PassRegistry &);
132+
void initializeFixupBWInstPassPass(PassRegistry &);
133+
void initializeFixupLEAPassPass(PassRegistry &);
134+
void initializeShadowCallStackPass(PassRegistry &);
135+
void initializeWinEHStatePassPass(PassRegistry &);
136+
void initializeX86AvoidSFBPassPass(PassRegistry &);
137+
void initializeX86CallFrameOptimizationPass(PassRegistry &);
138+
void initializeX86CmovConverterPassPass(PassRegistry &);
139+
void initializeX86DomainReassignmentPass(PassRegistry &);
140+
void initializeX86ExecutionDomainFixPass(PassRegistry &);
141+
void initializeX86FlagsCopyLoweringPassPass(PassRegistry &);
142+
void initializeX86SpeculativeLoadHardeningPassPass(PassRegistry &);
143+
135144
} // End llvm namespace
136145

137146
#endif

llvm/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ using namespace llvm;
5252

5353
#define DEBUG_TYPE "x86-avoid-SFB"
5454

55-
namespace llvm {
56-
void initializeX86AvoidSFBPassPass(PassRegistry &);
57-
} // end namespace llvm
58-
5955
static cl::opt<bool> DisableX86AvoidStoreForwardBlocks(
6056
"x86-disable-avoid-SFB", cl::Hidden,
6157
cl::desc("X86: Disable Store Forwarding Blocks fixup."), cl::init(false));

llvm/lib/Target/X86/X86CallFrameOptimization.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ static cl::opt<bool>
5656
cl::desc("Avoid optimizing x86 call frames for size"),
5757
cl::init(false), cl::Hidden);
5858

59-
namespace llvm {
60-
void initializeX86CallFrameOptimizationPass(PassRegistry &);
61-
}
62-
6359
namespace {
6460

6561
class X86CallFrameOptimization : public MachineFunctionPass {

llvm/lib/Target/X86/X86CmovConversion.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ STATISTIC(NumOfCmovGroupCandidate, "Number of CMOV-group candidates");
8181
STATISTIC(NumOfLoopCandidate, "Number of CMOV-conversion profitable loops");
8282
STATISTIC(NumOfOptimizedCmovGroups, "Number of optimized CMOV-groups");
8383

84-
namespace llvm {
85-
86-
void initializeX86CmovConverterPassPass(PassRegistry &);
87-
88-
} // end namespace llvm
89-
9084
// This internal switch can be used to turn off the cmov/branch optimization.
9185
static cl::opt<bool>
9286
EnableCmovConverter("x86-cmov-converter",

llvm/lib/Target/X86/X86DomainReassignment.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131

3232
using namespace llvm;
3333

34-
namespace llvm {
35-
void initializeX86DomainReassignmentPass(PassRegistry &);
36-
}
37-
3834
#define DEBUG_TYPE "x86-domain-reassignment"
3935

4036
STATISTIC(NumClosuresConverted, "Number of closures converted by the pass");

llvm/lib/Target/X86/X86FixupLEAs.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
#include "llvm/Support/raw_ostream.h"
2626
using namespace llvm;
2727

28-
namespace llvm {
29-
void initializeFixupLEAPassPass(PassRegistry &);
30-
}
31-
3228
#define FIXUPLEA_DESC "X86 LEA Fixup"
3329
#define FIXUPLEA_NAME "x86-fixup-LEAs"
3430

llvm/lib/Target/X86/X86SpeculativeLoadHardening.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ static cl::opt<bool> HardenIndirectCallsAndJumps(
119119
"mitigate Spectre v1.2 style attacks."),
120120
cl::init(true), cl::Hidden);
121121

122-
namespace llvm {
123-
124-
void initializeX86SpeculativeLoadHardeningPassPass(PassRegistry &);
125-
126-
} // end namespace llvm
127-
128122
namespace {
129123

130124
class X86SpeculativeLoadHardeningPass : public MachineFunctionPass {

llvm/lib/Target/X86/X86TargetMachine.cpp

-15
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@ static cl::opt<bool> EnableCondBrFoldingPass("x86-condbr-folding",
5959
"folding pass"),
6060
cl::init(true), cl::Hidden);
6161

62-
namespace llvm {
63-
64-
void initializeWinEHStatePassPass(PassRegistry &);
65-
void initializeFixupLEAPassPass(PassRegistry &);
66-
void initializeShadowCallStackPass(PassRegistry &);
67-
void initializeX86CallFrameOptimizationPass(PassRegistry &);
68-
void initializeX86CmovConverterPassPass(PassRegistry &);
69-
void initializeX86ExecutionDomainFixPass(PassRegistry &);
70-
void initializeX86DomainReassignmentPass(PassRegistry &);
71-
void initializeX86AvoidSFBPassPass(PassRegistry &);
72-
void initializeX86SpeculativeLoadHardeningPassPass(PassRegistry &);
73-
void initializeX86FlagsCopyLoweringPassPass(PassRegistry &);
74-
75-
} // end namespace llvm
76-
7762
extern "C" void LLVMInitializeX86Target() {
7863
// Register the target.
7964
RegisterTargetMachine<X86TargetMachine> X(getTheX86_32Target());

llvm/lib/Target/X86/X86WinEHState.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ using namespace llvm;
3434

3535
#define DEBUG_TYPE "winehstate"
3636

37-
namespace llvm {
38-
void initializeWinEHStatePassPass(PassRegistry &);
39-
}
40-
4137
namespace {
4238
const int OverdefinedState = INT_MIN;
4339

0 commit comments

Comments
 (0)