From 775079c227083be3fe22f6ae071d5b74a7ade745 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 4 Sep 2013 20:08:46 +0000 Subject: [PATCH] Rename some variables to match the style guide. I am about to patch this code, and this makes the diff far more readable. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189982 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Transforms/IPO.h | 2 +- lib/Transforms/IPO/Internalize.cpp | 12 ++++++------ tools/lto/LTOCodeGenerator.cpp | 34 +++++++++++++++++----------------- tools/lto/LTOCodeGenerator.h | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/llvm/Transforms/IPO.h b/include/llvm/Transforms/IPO.h index e6eb8d38bb8..6ebb6c46586 100644 --- a/include/llvm/Transforms/IPO.h +++ b/include/llvm/Transforms/IPO.h @@ -109,7 +109,7 @@ Pass *createPruneEHPass(); /// /// Note that commandline options that are used with the above function are not /// used now! -ModulePass *createInternalizePass(ArrayRef exportList); +ModulePass *createInternalizePass(ArrayRef ExportList); /// createInternalizePass - Same as above, but with an empty exportList. ModulePass *createInternalizePass(); diff --git a/lib/Transforms/IPO/Internalize.cpp b/lib/Transforms/IPO/Internalize.cpp index ff566546816..f2feacc0b63 100644 --- a/lib/Transforms/IPO/Internalize.cpp +++ b/lib/Transforms/IPO/Internalize.cpp @@ -50,7 +50,7 @@ namespace { public: static char ID; // Pass identification, replacement for typeid explicit InternalizePass(); - explicit InternalizePass(ArrayRef exportList); + explicit InternalizePass(ArrayRef ExportList); void LoadFile(const char *Filename); virtual bool runOnModule(Module &M); @@ -73,11 +73,11 @@ InternalizePass::InternalizePass() ExternalNames.insert(APIList.begin(), APIList.end()); } -InternalizePass::InternalizePass(ArrayRef exportList) +InternalizePass::InternalizePass(ArrayRef ExportList) : ModulePass(ID){ initializeInternalizePassPass(*PassRegistry::getPassRegistry()); - for(ArrayRef::const_iterator itr = exportList.begin(); - itr != exportList.end(); itr++) { + for(ArrayRef::const_iterator itr = ExportList.begin(); + itr != ExportList.end(); itr++) { ExternalNames.insert(*itr); } } @@ -210,6 +210,6 @@ ModulePass *llvm::createInternalizePass() { return new InternalizePass(); } -ModulePass *llvm::createInternalizePass(ArrayRef el) { - return new InternalizePass(el); +ModulePass *llvm::createInternalizePass(ArrayRef ExportList) { + return new InternalizePass(ExportList); } diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index e3e1ab3bf75..19e8c4c1491 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -300,18 +300,18 @@ bool LTOCodeGenerator::determineTarget(std::string &errMsg) { void LTOCodeGenerator:: applyRestriction(GlobalValue &GV, - std::vector &mustPreserveList, - SmallPtrSet &asmUsed, - Mangler &mangler) { + std::vector &MustPreserveList, + SmallPtrSet &AsmUsed, + Mangler &Mangler) { SmallString<64> Buffer; - mangler.getNameWithPrefix(Buffer, &GV, false); + Mangler.getNameWithPrefix(Buffer, &GV, false); if (GV.isDeclaration()) return; if (MustPreserveSymbols.count(Buffer)) - mustPreserveList.push_back(GV.getName().data()); + MustPreserveList.push_back(GV.getName().data()); if (AsmUndefinedRefs.count(Buffer)) - asmUsed.insert(&GV); + AsmUsed.insert(&GV); } static void findUsedValues(GlobalVariable *LLVMUsed, @@ -337,31 +337,31 @@ void LTOCodeGenerator::applyScopeRestrictions() { // mark which symbols can not be internalized MCContext MContext(TargetMach->getMCAsmInfo(), TargetMach->getRegisterInfo(), NULL); - Mangler mangler(MContext, TargetMach); - std::vector mustPreserveList; - SmallPtrSet asmUsed; + Mangler Mangler(MContext, TargetMach); + std::vector MustPreserveList; + SmallPtrSet AsmUsed; for (Module::iterator f = mergedModule->begin(), e = mergedModule->end(); f != e; ++f) - applyRestriction(*f, mustPreserveList, asmUsed, mangler); + applyRestriction(*f, MustPreserveList, AsmUsed, Mangler); for (Module::global_iterator v = mergedModule->global_begin(), e = mergedModule->global_end(); v != e; ++v) - applyRestriction(*v, mustPreserveList, asmUsed, mangler); + applyRestriction(*v, MustPreserveList, AsmUsed, Mangler); for (Module::alias_iterator a = mergedModule->alias_begin(), e = mergedModule->alias_end(); a != e; ++a) - applyRestriction(*a, mustPreserveList, asmUsed, mangler); + applyRestriction(*a, MustPreserveList, AsmUsed, Mangler); GlobalVariable *LLVMCompilerUsed = mergedModule->getGlobalVariable("llvm.compiler.used"); - findUsedValues(LLVMCompilerUsed, asmUsed); + findUsedValues(LLVMCompilerUsed, AsmUsed); if (LLVMCompilerUsed) LLVMCompilerUsed->eraseFromParent(); - if (!asmUsed.empty()) { + if (!AsmUsed.empty()) { llvm::Type *i8PTy = llvm::Type::getInt8PtrTy(Context); std::vector asmUsed2; - for (SmallPtrSet::const_iterator i = asmUsed.begin(), - e = asmUsed.end(); i !=e; ++i) { + for (SmallPtrSet::const_iterator i = AsmUsed.begin(), + e = AsmUsed.end(); i !=e; ++i) { GlobalValue *GV = *i; Constant *c = ConstantExpr::getBitCast(GV, i8PTy); asmUsed2.push_back(c); @@ -377,7 +377,7 @@ void LTOCodeGenerator::applyScopeRestrictions() { LLVMCompilerUsed->setSection("llvm.metadata"); } - passes.add(createInternalizePass(mustPreserveList)); + passes.add(createInternalizePass(MustPreserveList)); // apply scope restrictions passes.run(*mergedModule); diff --git a/tools/lto/LTOCodeGenerator.h b/tools/lto/LTOCodeGenerator.h index 8f551f86344..02633629f98 100644 --- a/tools/lto/LTOCodeGenerator.h +++ b/tools/lto/LTOCodeGenerator.h @@ -106,9 +106,9 @@ private: bool generateObjectFile(llvm::raw_ostream &out, std::string &errMsg); void applyScopeRestrictions(); void applyRestriction(llvm::GlobalValue &GV, - std::vector &mustPreserveList, - llvm::SmallPtrSet &asmUsed, - llvm::Mangler &mangler); + std::vector &MustPreserveList, + llvm::SmallPtrSet &AsmUsed, + llvm::Mangler &Mangler); bool determineTarget(std::string &errMsg); typedef llvm::StringMap StringSet; -- 2.11.0