From 4865d2bec1694f04a59a10261e46ac16f7afd0ad Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Mon, 4 Nov 2019 17:24:18 +0000 Subject: [PATCH] [X86] Fix uninitialized variable warnings. NFCI. --- lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp | 8 ++++---- lib/Target/X86/X86FixupLEAs.cpp | 4 ++-- lib/Target/X86/X86FixupSetCC.cpp | 4 ++-- lib/Target/X86/X86FlagsCopyLowering.cpp | 16 ++++++++-------- lib/Target/X86/X86IndirectBranchTracking.cpp | 4 ++-- lib/Target/X86/X86OptimizeLEAs.cpp | 6 +++--- lib/Target/X86/X86RetpolineThunks.cpp | 12 ++++++------ lib/Target/X86/X86SpeculativeLoadHardening.cpp | 12 ++++++------ lib/Target/X86/X86WinAllocaExpander.cpp | 16 ++++++++-------- lib/Target/X86/X86WinEHState.cpp | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp b/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp index 69c6b3356cb..6e7d0c74bf6 100644 --- a/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp +++ b/lib/Target/X86/X86AvoidStoreForwardingBlocks.cpp @@ -83,13 +83,13 @@ public: } private: - MachineRegisterInfo *MRI; - const X86InstrInfo *TII; - const X86RegisterInfo *TRI; + MachineRegisterInfo *MRI = nullptr; + const X86InstrInfo *TII = nullptr; + const X86RegisterInfo *TRI = nullptr; SmallVector, 2> BlockedLoadsStoresPairs; SmallVector ForRemoval; - AliasAnalysis *AA; + AliasAnalysis *AA = nullptr; /// Returns couples of Load then Store to memory which look /// like a memcpy. diff --git a/lib/Target/X86/X86FixupLEAs.cpp b/lib/Target/X86/X86FixupLEAs.cpp index 543dc8b00fa..46cb467485c 100644 --- a/lib/Target/X86/X86FixupLEAs.cpp +++ b/lib/Target/X86/X86FixupLEAs.cpp @@ -113,8 +113,8 @@ public: private: TargetSchedModel TSM; - const X86InstrInfo *TII; - const X86RegisterInfo *TRI; + const X86InstrInfo *TII = nullptr; + const X86RegisterInfo *TRI = nullptr; }; } diff --git a/lib/Target/X86/X86FixupSetCC.cpp b/lib/Target/X86/X86FixupSetCC.cpp index cbde280aa28..09fa0e45b01 100644 --- a/lib/Target/X86/X86FixupSetCC.cpp +++ b/lib/Target/X86/X86FixupSetCC.cpp @@ -54,8 +54,8 @@ private: // output. bool isSetCCr(unsigned Opode); - MachineRegisterInfo *MRI; - const X86InstrInfo *TII; + MachineRegisterInfo *MRI = nullptr; + const X86InstrInfo *TII = nullptr; enum { SearchBound = 16 }; diff --git a/lib/Target/X86/X86FlagsCopyLowering.cpp b/lib/Target/X86/X86FlagsCopyLowering.cpp index cfba06fb653..46fe5b54fad 100644 --- a/lib/Target/X86/X86FlagsCopyLowering.cpp +++ b/lib/Target/X86/X86FlagsCopyLowering.cpp @@ -87,12 +87,12 @@ public: static char ID; private: - MachineRegisterInfo *MRI; - const X86Subtarget *Subtarget; - const X86InstrInfo *TII; - const TargetRegisterInfo *TRI; - const TargetRegisterClass *PromoteRC; - MachineDominatorTree *MDT; + MachineRegisterInfo *MRI = nullptr; + const X86Subtarget *Subtarget = nullptr; + const X86InstrInfo *TII = nullptr; + const TargetRegisterInfo *TRI = nullptr; + const TargetRegisterClass *PromoteRC = nullptr; + MachineDominatorTree *MDT = nullptr; CondRegArray collectCondsInRegs(MachineBasicBlock &MBB, MachineBasicBlock::iterator CopyDefI); @@ -779,10 +779,10 @@ void X86FlagsCopyLoweringPass::rewriteArithmetic( CondRegArray &CondRegs) { // Arithmetic is either reading CF or OF. Figure out which condition we need // to preserve in a register. - X86::CondCode Cond; + X86::CondCode Cond = X86::COND_INVALID; // The addend to use to reset CF or OF when added to the flag value. - int Addend; + int Addend = 0; switch (getMnemonicFromOpcode(MI.getOpcode())) { case FlagArithMnemonic::ADC: diff --git a/lib/Target/X86/X86IndirectBranchTracking.cpp b/lib/Target/X86/X86IndirectBranchTracking.cpp index be12e298f42..48d0d8a3570 100644 --- a/lib/Target/X86/X86IndirectBranchTracking.cpp +++ b/lib/Target/X86/X86IndirectBranchTracking.cpp @@ -48,10 +48,10 @@ private: static char ID; /// Machine instruction info used throughout the class. - const X86InstrInfo *TII; + const X86InstrInfo *TII = nullptr; /// Endbr opcode for the current machine function. - unsigned int EndbrOpcode; + unsigned int EndbrOpcode = 0; /// Adds a new ENDBR instruction to the beginning of the MBB. /// The function will not add it if already exists. diff --git a/lib/Target/X86/X86OptimizeLEAs.cpp b/lib/Target/X86/X86OptimizeLEAs.cpp index 1aee01563c4..8fa553f5c84 100644 --- a/lib/Target/X86/X86OptimizeLEAs.cpp +++ b/lib/Target/X86/X86OptimizeLEAs.cpp @@ -294,9 +294,9 @@ private: DenseMap InstrPos; - MachineRegisterInfo *MRI; - const X86InstrInfo *TII; - const X86RegisterInfo *TRI; + MachineRegisterInfo *MRI = nullptr; + const X86InstrInfo *TII = nullptr; + const X86RegisterInfo *TRI = nullptr; }; } // end anonymous namespace diff --git a/lib/Target/X86/X86RetpolineThunks.cpp b/lib/Target/X86/X86RetpolineThunks.cpp index f8464c7e829..9085d7f068a 100644 --- a/lib/Target/X86/X86RetpolineThunks.cpp +++ b/lib/Target/X86/X86RetpolineThunks.cpp @@ -63,13 +63,13 @@ public: } private: - MachineModuleInfo *MMI; - const TargetMachine *TM; - bool Is64Bit; - const X86Subtarget *STI; - const X86InstrInfo *TII; + MachineModuleInfo *MMI = nullptr; + const TargetMachine *TM = nullptr; + bool Is64Bit = false; + const X86Subtarget *STI = nullptr; + const X86InstrInfo *TII = nullptr; - bool InsertedThunks; + bool InsertedThunks = false; void createThunkFunction(Module &M, StringRef Name); void insertRegReturnAddrClobber(MachineBasicBlock &MBB, unsigned Reg); diff --git a/lib/Target/X86/X86SpeculativeLoadHardening.cpp b/lib/Target/X86/X86SpeculativeLoadHardening.cpp index b8980789258..9aa47c532e8 100644 --- a/lib/Target/X86/X86SpeculativeLoadHardening.cpp +++ b/lib/Target/X86/X86SpeculativeLoadHardening.cpp @@ -148,8 +148,8 @@ private: /// Manages the predicate state traced through the program. struct PredState { - unsigned InitialReg; - unsigned PoisonReg; + unsigned InitialReg = 0; + unsigned PoisonReg = 0; const TargetRegisterClass *RC; MachineSSAUpdater SSA; @@ -158,10 +158,10 @@ private: : RC(RC), SSA(MF) {} }; - const X86Subtarget *Subtarget; - MachineRegisterInfo *MRI; - const X86InstrInfo *TII; - const TargetRegisterInfo *TRI; + const X86Subtarget *Subtarget = nullptr; + MachineRegisterInfo *MRI = nullptr; + const X86InstrInfo *TII = nullptr; + const TargetRegisterInfo *TRI = nullptr; Optional PS; diff --git a/lib/Target/X86/X86WinAllocaExpander.cpp b/lib/Target/X86/X86WinAllocaExpander.cpp index ae72c642758..42e8fba2201 100644 --- a/lib/Target/X86/X86WinAllocaExpander.cpp +++ b/lib/Target/X86/X86WinAllocaExpander.cpp @@ -54,14 +54,14 @@ private: /// Lower a WinAlloca instruction. void lower(MachineInstr* MI, Lowering L); - MachineRegisterInfo *MRI; - const X86Subtarget *STI; - const TargetInstrInfo *TII; - const X86RegisterInfo *TRI; - unsigned StackPtr; - unsigned SlotSize; - int64_t StackProbeSize; - bool NoStackArgProbe; + MachineRegisterInfo *MRI = nullptr; + const X86Subtarget *STI = nullptr; + const TargetInstrInfo *TII = nullptr; + const X86RegisterInfo *TRI = nullptr; + unsigned StackPtr = 0; + unsigned SlotSize = 0; + int64_t StackProbeSize = 0; + bool NoStackArgProbe = false; StringRef getPassName() const override { return "X86 WinAlloca Expander"; } static char ID; diff --git a/lib/Target/X86/X86WinEHState.cpp b/lib/Target/X86/X86WinEHState.cpp index d65e1f3ab41..f60bc01673f 100644 --- a/lib/Target/X86/X86WinEHState.cpp +++ b/lib/Target/X86/X86WinEHState.cpp @@ -91,7 +91,7 @@ private: EHPersonality Personality = EHPersonality::Unknown; Function *PersonalityFn = nullptr; bool UseStackGuard = false; - int ParentBaseState; + int ParentBaseState = 0; FunctionCallee SehLongjmpUnwind = nullptr; Constant *Cookie = nullptr;