From 96f498bd9f140a98321c478f517877c4767b94fa Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Sun, 13 Jan 2013 16:01:15 +0000 Subject: [PATCH] Remove redundant 'llvm::' qualifications git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172358 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/StringRef.h | 2 +- include/llvm/Analysis/DOTGraphTraitsPass.h | 8 ++--- include/llvm/Object/RelocVisitor.h | 4 +-- include/llvm/Support/YAMLTraits.h | 34 +++++++++---------- lib/Analysis/ValueTracking.cpp | 2 +- lib/MC/ELFObjectWriter.cpp | 2 +- lib/MC/WinCOFFObjectWriter.cpp | 24 ++++++------- lib/Support/APFloat.cpp | 2 +- lib/Support/DynamicLibrary.cpp | 2 +- lib/Target/R600/AMDGPUSubtarget.h | 2 +- lib/Target/R600/AMDILDevice.h | 2 +- lib/Target/R600/AMDILPeepholeOptimizer.cpp | 8 ++--- .../IPO/DeadArgumentElimination.cpp | 2 +- 13 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/llvm/ADT/StringRef.h b/include/llvm/ADT/StringRef.h index 0e93f51ef09..1e21d921f62 100644 --- a/include/llvm/ADT/StringRef.h +++ b/include/llvm/ADT/StringRef.h @@ -535,7 +535,7 @@ namespace llvm { return LHS.compare(RHS) != -1; } - inline std::string &operator+=(std::string &buffer, llvm::StringRef string) { + inline std::string &operator+=(std::string &buffer, StringRef string) { return buffer.append(string.data(), string.size()); } diff --git a/include/llvm/Analysis/DOTGraphTraitsPass.h b/include/llvm/Analysis/DOTGraphTraitsPass.h index d9d15a4065a..0fc1c2dc360 100644 --- a/include/llvm/Analysis/DOTGraphTraitsPass.h +++ b/include/llvm/Analysis/DOTGraphTraitsPass.h @@ -22,7 +22,7 @@ namespace llvm { template class DOTGraphTraitsViewer : public FunctionPass { public: - DOTGraphTraitsViewer(llvm::StringRef GraphName, char &ID) + DOTGraphTraitsViewer(StringRef GraphName, char &ID) : FunctionPass(ID), Name(GraphName) {} virtual bool runOnFunction(Function &F) { @@ -47,7 +47,7 @@ private: template class DOTGraphTraitsPrinter : public FunctionPass { public: - DOTGraphTraitsPrinter(llvm::StringRef GraphName, char &ID) + DOTGraphTraitsPrinter(StringRef GraphName, char &ID) : FunctionPass(ID), Name(GraphName) {} virtual bool runOnFunction(Function &F) { @@ -82,7 +82,7 @@ private: template class DOTGraphTraitsModuleViewer : public ModulePass { public: - DOTGraphTraitsModuleViewer(llvm::StringRef GraphName, char &ID) + DOTGraphTraitsModuleViewer(StringRef GraphName, char &ID) : ModulePass(ID), Name(GraphName) {} virtual bool runOnModule(Module &M) { @@ -106,7 +106,7 @@ private: template class DOTGraphTraitsModulePrinter : public ModulePass { public: - DOTGraphTraitsModulePrinter(llvm::StringRef GraphName, char &ID) + DOTGraphTraitsModulePrinter(StringRef GraphName, char &ID) : ModulePass(ID), Name(GraphName) {} virtual bool runOnModule(Module &M) { diff --git a/include/llvm/Object/RelocVisitor.h b/include/llvm/Object/RelocVisitor.h index 6100185d3b4..0bfa9408c76 100644 --- a/include/llvm/Object/RelocVisitor.h +++ b/include/llvm/Object/RelocVisitor.h @@ -40,7 +40,7 @@ struct RelocToApply { /// @brief Base class for object file relocation visitors. class RelocVisitor { public: - explicit RelocVisitor(llvm::StringRef FileFormat) + explicit RelocVisitor(StringRef FileFormat) : FileFormat(FileFormat), HasError(false) {} // TODO: Should handle multiple applied relocations via either passing in the @@ -83,7 +83,7 @@ public: bool error() { return HasError; } private: - llvm::StringRef FileFormat; + StringRef FileFormat; bool HasError; /// Operations diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h index 4e0c70cbf2d..801868ff1f1 100644 --- a/include/llvm/Support/YAMLTraits.h +++ b/include/llvm/Support/YAMLTraits.h @@ -195,7 +195,7 @@ public: template struct has_ScalarTraits { - typedef llvm::StringRef (*Signature_input)(llvm::StringRef, void*, T&); + typedef StringRef (*Signature_input)(StringRef, void*, T&); typedef void (*Signature_output)(const T&, void*, llvm::raw_ostream&); template @@ -528,73 +528,73 @@ yamlize(IO &io, T &Seq, bool) { template<> struct ScalarTraits { static void output(const bool &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, bool &); + static StringRef input(StringRef, void*, bool &); }; template<> struct ScalarTraits { static void output(const StringRef &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, StringRef &); + static StringRef input(StringRef, void*, StringRef &); }; template<> struct ScalarTraits { static void output(const uint8_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, uint8_t &); + static StringRef input(StringRef, void*, uint8_t &); }; template<> struct ScalarTraits { static void output(const uint16_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, uint16_t &); + static StringRef input(StringRef, void*, uint16_t &); }; template<> struct ScalarTraits { static void output(const uint32_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, uint32_t &); + static StringRef input(StringRef, void*, uint32_t &); }; template<> struct ScalarTraits { static void output(const uint64_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, uint64_t &); + static StringRef input(StringRef, void*, uint64_t &); }; template<> struct ScalarTraits { static void output(const int8_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, int8_t &); + static StringRef input(StringRef, void*, int8_t &); }; template<> struct ScalarTraits { static void output(const int16_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, int16_t &); + static StringRef input(StringRef, void*, int16_t &); }; template<> struct ScalarTraits { static void output(const int32_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, int32_t &); + static StringRef input(StringRef, void*, int32_t &); }; template<> struct ScalarTraits { static void output(const int64_t &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, int64_t &); + static StringRef input(StringRef, void*, int64_t &); }; template<> struct ScalarTraits { static void output(const float &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, float &); + static StringRef input(StringRef, void*, float &); }; template<> struct ScalarTraits { static void output(const double &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, double &); + static StringRef input(StringRef, void*, double &); }; @@ -913,25 +913,25 @@ LLVM_YAML_STRONG_TYPEDEF(uint64_t, Hex64) template<> struct ScalarTraits { static void output(const Hex8 &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, Hex8 &); + static StringRef input(StringRef, void*, Hex8 &); }; template<> struct ScalarTraits { static void output(const Hex16 &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, Hex16 &); + static StringRef input(StringRef, void*, Hex16 &); }; template<> struct ScalarTraits { static void output(const Hex32 &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, Hex32 &); + static StringRef input(StringRef, void*, Hex32 &); }; template<> struct ScalarTraits { static void output(const Hex64 &, void*, llvm::raw_ostream &); - static llvm::StringRef input(llvm::StringRef , void*, Hex64 &); + static StringRef input(StringRef, void*, Hex64 &); }; diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp index efb9b0865a6..23bc4442f83 100644 --- a/lib/Analysis/ValueTracking.cpp +++ b/lib/Analysis/ValueTracking.cpp @@ -1510,7 +1510,7 @@ static Value *BuildSubAggregate(Value *From, Value* To, Type *IndexedType, SmallVector &Idxs, unsigned IdxSkip, Instruction *InsertBefore) { - llvm::StructType *STy = llvm::dyn_cast(IndexedType); + llvm::StructType *STy = dyn_cast(IndexedType); if (STy) { // Save the original To argument so we can modify it Value *OrigTo = To; diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index bfe17094628..00724465f6a 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -865,7 +865,7 @@ void ELFObjectWriter::ComputeSymbolTable(MCAssembler &Asm, // FIXME: Is this the correct place to do this? // FIXME: Why is an undefined reference to _GLOBAL_OFFSET_TABLE_ needed? if (NeedsGOT) { - llvm::StringRef Name = "_GLOBAL_OFFSET_TABLE_"; + StringRef Name = "_GLOBAL_OFFSET_TABLE_"; MCSymbol *Sym = Asm.getContext().GetOrCreateSymbol(Name); MCSymbolData &Data = Asm.getOrCreateSymbolData(*Sym); Data.setExternal(true); diff --git a/lib/MC/WinCOFFObjectWriter.cpp b/lib/MC/WinCOFFObjectWriter.cpp index 01860c5d7f7..e1d65387a1a 100644 --- a/lib/MC/WinCOFFObjectWriter.cpp +++ b/lib/MC/WinCOFFObjectWriter.cpp @@ -36,7 +36,7 @@ using namespace llvm; namespace { -typedef llvm::SmallString name; +typedef SmallString name; enum AuxiliaryType { ATFunctionDefinition, @@ -58,7 +58,7 @@ class COFFSymbol { public: COFF::symbol Data; - typedef llvm::SmallVector AuxiliarySymbols; + typedef SmallVector AuxiliarySymbols; name Name; int Index; @@ -69,7 +69,7 @@ public: MCSymbolData const *MCData; - COFFSymbol(llvm::StringRef name); + COFFSymbol(StringRef name); size_t size() const; void set_name_offset(uint32_t Offset); @@ -97,13 +97,13 @@ public: COFFSymbol *Symbol; relocations Relocations; - COFFSection(llvm::StringRef name); + COFFSection(StringRef name); static size_t size(); }; // This class holds the COFF string table. class StringTable { - typedef llvm::StringMap map; + typedef StringMap map; map Map; void update_length(); @@ -112,7 +112,7 @@ public: StringTable(); size_t size() const; - size_t insert(llvm::StringRef String); + size_t insert(StringRef String); }; class WinCOFFObjectWriter : public MCObjectWriter { @@ -144,7 +144,7 @@ public: COFFSection *createSection(StringRef Name); template - object_t *createCOFFEntity(llvm::StringRef Name, list_t &List); + object_t *createCOFFEntity(StringRef Name, list_t &List); void DefineSection(MCSectionData const &SectionData); void DefineSymbol(MCSymbolData const &SymbolData, MCAssembler &Assembler); @@ -202,7 +202,7 @@ static inline void write_uint8_le(void *Data, uint8_t const &Value) { //------------------------------------------------------------------------------ // Symbol class implementation -COFFSymbol::COFFSymbol(llvm::StringRef name) +COFFSymbol::COFFSymbol(StringRef name) : Name(name.begin(), name.end()) , Other(NULL) , Section(NULL) @@ -254,7 +254,7 @@ bool COFFSymbol::should_keep() const { //------------------------------------------------------------------------------ // Section class implementation -COFFSection::COFFSection(llvm::StringRef name) +COFFSection::COFFSection(StringRef name) : Name(name) , MCData(NULL) , Symbol(NULL) { @@ -287,7 +287,7 @@ size_t StringTable::size() const { /// Add String to the table iff it is not already there. /// @returns the index into the string table where the string is now located. -size_t StringTable::insert(llvm::StringRef String) { +size_t StringTable::insert(StringRef String) { map::iterator i = Map.find(String); if (i != Map.end()) @@ -341,14 +341,14 @@ COFFSymbol *WinCOFFObjectWriter::GetOrCreateCOFFSymbol(const MCSymbol * Symbol){ return RetSymbol; } -COFFSection *WinCOFFObjectWriter::createSection(llvm::StringRef Name) { +COFFSection *WinCOFFObjectWriter::createSection(StringRef Name) { return createCOFFEntity(Name, Sections); } /// A template used to lookup or create a symbol/section, and initialize it if /// needed. template -object_t *WinCOFFObjectWriter::createCOFFEntity(llvm::StringRef Name, +object_t *WinCOFFObjectWriter::createCOFFEntity(StringRef Name, list_t &List) { object_t *Object = new object_t(Name); diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp index 0e3c619170d..4a7a5d1a056 100644 --- a/lib/Support/APFloat.cpp +++ b/lib/Support/APFloat.cpp @@ -3448,7 +3448,7 @@ void APFloat::toString(SmallVectorImpl &Str, AdjustToPrecision(significand, exp, FormatPrecision); - llvm::SmallVector buffer; + SmallVector buffer; // Fill the buffer. unsigned precision = significand.getBitWidth(); diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp index d40439a1f37..f14cb45d9dc 100644 --- a/lib/Support/DynamicLibrary.cpp +++ b/lib/Support/DynamicLibrary.cpp @@ -46,7 +46,7 @@ void llvm::sys::DynamicLibrary::AddSymbol(StringRef symbolName, void *symbolValue) { SmartScopedLock lock(getMutex()); if (ExplicitSymbols == 0) - ExplicitSymbols = new llvm::StringMap(); + ExplicitSymbols = new StringMap(); (*ExplicitSymbols)[symbolName] = symbolValue; } diff --git a/lib/Target/R600/AMDGPUSubtarget.h b/lib/Target/R600/AMDGPUSubtarget.h index cab7884ea3a..1973fc6d544 100644 --- a/lib/Target/R600/AMDGPUSubtarget.h +++ b/lib/Target/R600/AMDGPUSubtarget.h @@ -44,7 +44,7 @@ public: virtual ~AMDGPUSubtarget(); const InstrItineraryData &getInstrItineraryData() const { return InstrItins; } - virtual void ParseSubtargetFeatures(llvm::StringRef CPU, llvm::StringRef FS); + virtual void ParseSubtargetFeatures(StringRef CPU, StringRef FS); bool isOverride(AMDGPUDeviceInfo::Caps) const; bool is64bit() const; diff --git a/lib/Target/R600/AMDILDevice.h b/lib/Target/R600/AMDILDevice.h index b9a15609df6..97df98cafb2 100644 --- a/lib/Target/R600/AMDILDevice.h +++ b/lib/Target/R600/AMDILDevice.h @@ -104,7 +104,7 @@ public: static const unsigned int QuarterWavefrontSize = 16; protected: virtual void setCaps(); - llvm::BitVector mHWBits; + BitVector mHWBits; llvm::BitVector mSWBits; AMDGPUSubtarget *mSTM; uint32_t DeviceFlag; diff --git a/lib/Target/R600/AMDILPeepholeOptimizer.cpp b/lib/Target/R600/AMDILPeepholeOptimizer.cpp index a3d30af375d..a5f7ee5053e 100644 --- a/lib/Target/R600/AMDILPeepholeOptimizer.cpp +++ b/lib/Target/R600/AMDILPeepholeOptimizer.cpp @@ -613,7 +613,7 @@ AMDGPUPeepholeOpt::optimizeBitInsert(Instruction *inst) { if (isVector) { name += "_v" + itostr(numEle) + "u32"; } else { name += "_u32"; } Function *Func = dyn_cast(inst->getParent()->getParent()->getParent()-> - getOrInsertFunction(llvm::StringRef(name), funcType)); + getOrInsertFunction(StringRef(name), funcType)); Value *Operands[4] = { width, offset, @@ -777,7 +777,7 @@ AMDGPUPeepholeOpt::optimizeBitExtract(Instruction *inst) { // Lets create the function. Function *Func = dyn_cast(inst->getParent()->getParent()->getParent()-> - getOrInsertFunction(llvm::StringRef(name), funcType)); + getOrInsertFunction(StringRef(name), funcType)); Value *Operands[3] = { ShiftInst->getOperand(0), shiftValConst, @@ -967,7 +967,7 @@ AMDGPUPeepholeOpt::expandSigned24BitOps(CallInst *CI) { } Function *Func = dyn_cast( CI->getParent()->getParent()->getParent()-> - getOrInsertFunction(llvm::StringRef(name), funcType)); + getOrInsertFunction(StringRef(name), funcType)); Value *Operands[3] = { CI->getOperand(0), CI->getOperand(1), @@ -999,7 +999,7 @@ AMDGPUPeepholeOpt::expandSigned24BitOps(CallInst *CI) { } Function *Func = dyn_cast( CI->getParent()->getParent()->getParent()-> - getOrInsertFunction(llvm::StringRef(name), funcType)); + getOrInsertFunction(StringRef(name), funcType)); Value *Operands[2] = { CI->getOperand(0), CI->getOperand(1) diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index ff040e7af02..4757ce80931 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -351,7 +351,7 @@ bool DAE::RemoveDeadArgumentsFromCallers(Function &Fn) if (Fn.use_empty()) return false; - llvm::SmallVector UnusedArgs; + SmallVector UnusedArgs; for (Function::arg_iterator I = Fn.arg_begin(), E = Fn.arg_end(); I != E; ++I) { Argument *Arg = I; -- 2.34.1