From 18f59c52f2641562978412e7c336f9ca9fe991c9 Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Fri, 18 Dec 2015 19:28:59 +0000 Subject: [PATCH] Rename variables to reflect linker split (NFC) Renamed variables to be more reflective of whether they are an instance of Linker, IRLinker or ModuleLinker. Also fix a stale comment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256011 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/LTO/LTOCodeGenerator.h | 2 +- lib/LTO/LTOCodeGenerator.cpp | 6 ++--- lib/Linker/IRMover.cpp | 36 ++++++++++++++--------------- lib/Linker/LinkModules.cpp | 8 +++---- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/llvm/LTO/LTOCodeGenerator.h b/include/llvm/LTO/LTOCodeGenerator.h index 8a79e6044f5..3820b211a38 100644 --- a/include/llvm/LTO/LTOCodeGenerator.h +++ b/include/llvm/LTO/LTOCodeGenerator.h @@ -171,7 +171,7 @@ private: LLVMContext &Context; std::unique_ptr MergedModule; - std::unique_ptr IRLinker; + std::unique_ptr TheLinker; std::unique_ptr TargetMach; bool EmitDwarfDebugInfo = false; bool ScopeRestrictionsDone = false; diff --git a/lib/LTO/LTOCodeGenerator.cpp b/lib/LTO/LTOCodeGenerator.cpp index e51366c2930..6baaaa4b139 100644 --- a/lib/LTO/LTOCodeGenerator.cpp +++ b/lib/LTO/LTOCodeGenerator.cpp @@ -66,7 +66,7 @@ const char* LTOCodeGenerator::getVersionString() { LTOCodeGenerator::LTOCodeGenerator(LLVMContext &Context) : Context(Context), MergedModule(new Module("ld-temp.o", Context)), - IRLinker(new Linker(*MergedModule)) { + TheLinker(new Linker(*MergedModule)) { initializeLTOPasses(); } @@ -106,7 +106,7 @@ bool LTOCodeGenerator::addModule(LTOModule *Mod) { assert(&Mod->getModule().getContext() == &Context && "Expected module in same context"); - bool ret = IRLinker->linkInModule(Mod->takeModule()); + bool ret = TheLinker->linkInModule(Mod->takeModule()); const std::vector &undefs = Mod->getAsmUndefinedRefs(); for (int i = 0, e = undefs.size(); i != e; ++i) @@ -122,7 +122,7 @@ void LTOCodeGenerator::setModule(std::unique_ptr Mod) { AsmUndefinedRefs.clear(); MergedModule = Mod->takeModule(); - IRLinker = make_unique(*MergedModule); + TheLinker = make_unique(*MergedModule); const std::vector &Undefs = Mod->getAsmUndefinedRefs(); for (int I = 0, E = Undefs.size(); I != E; ++I) diff --git a/lib/Linker/IRMover.cpp b/lib/Linker/IRMover.cpp index 5581eaf097e..718bfc998cb 100644 --- a/lib/Linker/IRMover.cpp +++ b/lib/Linker/IRMover.cpp @@ -335,7 +335,7 @@ LinkDiagnosticInfo::LinkDiagnosticInfo(DiagnosticSeverity Severity, void LinkDiagnosticInfo::print(DiagnosticPrinter &DP) const { DP << Msg; } //===----------------------------------------------------------------------===// -// ModuleLinker implementation. +// IRLinker implementation. //===----------------------------------------------------------------------===// namespace { @@ -345,10 +345,10 @@ class IRLinker; /// speeds up linking for modules with many/ lazily linked functions of which /// few get used. class GlobalValueMaterializer final : public ValueMaterializer { - IRLinker *ModLinker; + IRLinker *TheIRLinker; public: - GlobalValueMaterializer(IRLinker *ModLinker) : ModLinker(ModLinker) {} + GlobalValueMaterializer(IRLinker *TheIRLinker) : TheIRLinker(TheIRLinker) {} Value *materializeDeclFor(Value *V) override; void materializeInitFor(GlobalValue *New, GlobalValue *Old) override; Metadata *mapTemporaryMetadata(Metadata *MD) override; @@ -358,10 +358,10 @@ public: }; class LocalValueMaterializer final : public ValueMaterializer { - IRLinker *ModLinker; + IRLinker *TheIRLinker; public: - LocalValueMaterializer(IRLinker *ModLinker) : ModLinker(ModLinker) {} + LocalValueMaterializer(IRLinker *TheIRLinker) : TheIRLinker(TheIRLinker) {} Value *materializeDeclFor(Value *V) override; void materializeInitFor(GlobalValue *New, GlobalValue *Old) override; Metadata *mapTemporaryMetadata(Metadata *MD) override; @@ -567,47 +567,47 @@ static void forceRenaming(GlobalValue *GV, StringRef Name) { } Value *GlobalValueMaterializer::materializeDeclFor(Value *V) { - return ModLinker->materializeDeclFor(V, false); + return TheIRLinker->materializeDeclFor(V, false); } void GlobalValueMaterializer::materializeInitFor(GlobalValue *New, GlobalValue *Old) { - ModLinker->materializeInitFor(New, Old, false); + TheIRLinker->materializeInitFor(New, Old, false); } Metadata *GlobalValueMaterializer::mapTemporaryMetadata(Metadata *MD) { - return ModLinker->mapTemporaryMetadata(MD); + return TheIRLinker->mapTemporaryMetadata(MD); } void GlobalValueMaterializer::replaceTemporaryMetadata(const Metadata *OrigMD, Metadata *NewMD) { - ModLinker->replaceTemporaryMetadata(OrigMD, NewMD); + TheIRLinker->replaceTemporaryMetadata(OrigMD, NewMD); } bool GlobalValueMaterializer::isMetadataNeeded(Metadata *MD) { - return ModLinker->isMetadataNeeded(MD); + return TheIRLinker->isMetadataNeeded(MD); } Value *LocalValueMaterializer::materializeDeclFor(Value *V) { - return ModLinker->materializeDeclFor(V, true); + return TheIRLinker->materializeDeclFor(V, true); } void LocalValueMaterializer::materializeInitFor(GlobalValue *New, GlobalValue *Old) { - ModLinker->materializeInitFor(New, Old, true); + TheIRLinker->materializeInitFor(New, Old, true); } Metadata *LocalValueMaterializer::mapTemporaryMetadata(Metadata *MD) { - return ModLinker->mapTemporaryMetadata(MD); + return TheIRLinker->mapTemporaryMetadata(MD); } void LocalValueMaterializer::replaceTemporaryMetadata(const Metadata *OrigMD, Metadata *NewMD) { - ModLinker->replaceTemporaryMetadata(OrigMD, NewMD); + TheIRLinker->replaceTemporaryMetadata(OrigMD, NewMD); } bool LocalValueMaterializer::isMetadataNeeded(Metadata *MD) { - return ModLinker->isMetadataNeeded(MD); + return TheIRLinker->isMetadataNeeded(MD); } Value *IRLinker::materializeDeclFor(Value *V, bool ForAlias) { @@ -1650,9 +1650,9 @@ bool IRMover::move( std::function AddLazyFor, DenseMap *ValIDToTempMDMap, bool IsMetadataLinkingPostpass) { - IRLinker TheLinker(Composite, IdentifiedStructTypes, Src, ValuesToLink, - AddLazyFor, ValIDToTempMDMap, IsMetadataLinkingPostpass); - bool RetCode = TheLinker.run(); + IRLinker TheIRLinker(Composite, IdentifiedStructTypes, Src, ValuesToLink, + AddLazyFor, ValIDToTempMDMap, IsMetadataLinkingPostpass); + bool RetCode = TheIRLinker.run(); Composite.dropTriviallyDeadConstantArrays(); return RetCode; } diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 556251092a2..e866461cf9a 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -803,14 +803,14 @@ bool Linker::linkInModule(std::unique_ptr Src, unsigned Flags, const FunctionInfoIndex *Index, DenseSet *FunctionsToImport, DenseMap *ValIDToTempMDMap) { - ModuleLinker TheLinker(Mover, *Src, Flags, Index, FunctionsToImport, + ModuleLinker ModLinker(Mover, *Src, Flags, Index, FunctionsToImport, ValIDToTempMDMap); - return TheLinker.run(); + return ModLinker.run(); } bool Linker::linkInModuleForCAPI(Module &Src) { - ModuleLinker TheLinker(Mover, Src, 0, nullptr, nullptr); - return TheLinker.run(); + ModuleLinker ModLinker(Mover, Src, 0, nullptr, nullptr); + return ModLinker.run(); } bool Linker::linkInMetadata(Module &Src, -- 2.34.1