From f6330705bd032faa4ec47a86fd61b0c695d5fafb Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 12 Apr 2014 18:39:57 +0000 Subject: [PATCH] Make helper static and place random global into the llvm namespace. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206116 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMBaseInstrInfo.cpp | 2 +- lib/Target/ARM/ARMFeatures.h | 4 ++-- lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 2 +- lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp | 11 +++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp index 47f5bf929c7..f67d578d104 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -535,7 +535,7 @@ bool ARMBaseInstrInfo::isPredicable(MachineInstr *MI) const { return true; } -template<> bool IsCPSRDead(MachineInstr* MI) { +template <> bool llvm::IsCPSRDead(MachineInstr *MI) { for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) { const MachineOperand &MO = MI->getOperand(i); if (!MO.isReg() || MO.isUndef() || MO.isUse()) diff --git a/lib/Target/ARM/ARMFeatures.h b/lib/Target/ARM/ARMFeatures.h index 2c5a8c5164c..e191a3c779f 100644 --- a/lib/Target/ARM/ARMFeatures.h +++ b/lib/Target/ARM/ARMFeatures.h @@ -16,11 +16,11 @@ #include "MCTargetDesc/ARMMCTargetDesc.h" +namespace llvm { + template // could be MachineInstr or MCInst bool IsCPSRDead(InstrType *Instr); -namespace llvm { - template // could be MachineInstr or MCInst inline bool isV8EligibleForIT(InstrType *Instr) { switch (Instr->getOpcode()) { diff --git a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index b6dadd8f89a..88fc087bb73 100644 --- a/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -7975,7 +7975,7 @@ unsigned ARMAsmParser::checkTargetMatchPredicate(MCInst &Inst) { return Match_Success; } -template<> inline bool IsCPSRDead(MCInst* Instr) { +template <> inline bool llvm::IsCPSRDead(MCInst *Instr) { return true; // In an assembly source, no need to second-guess } diff --git a/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp b/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp index 34cc1b630c3..2f06adc798d 100644 --- a/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp +++ b/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp @@ -216,12 +216,11 @@ DecodeStatus ARM64Disassembler::getInstruction(MCInst &MI, uint64_t &Size, return Success; } -MCSymbolizer *createARM64ExternalSymbolizer( - StringRef TT, - LLVMOpInfoCallback GetOpInfo, - LLVMSymbolLookupCallback SymbolLookUp, - void *DisInfo, MCContext *Ctx, - MCRelocationInfo *RelInfo) { +static MCSymbolizer * +createARM64ExternalSymbolizer(StringRef TT, LLVMOpInfoCallback GetOpInfo, + LLVMSymbolLookupCallback SymbolLookUp, + void *DisInfo, MCContext *Ctx, + MCRelocationInfo *RelInfo) { return new llvm::ARM64ExternalSymbolizer( *Ctx, std::unique_ptr(RelInfo),