From 423177a54b9dd4134e9f416b9d83a16f2598c29d Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Thu, 15 Jan 2015 08:10:10 +0000 Subject: [PATCH] Remove WrapperNode. WrapperNode was a useless subclass of FileNode. We should just use FileNode instead. llvm-svn: 226145 --- lld/include/lld/Driver/WrapperInputGraph.h | 29 ---------------------- lld/lib/Driver/CoreDriver.cpp | 3 +-- lld/lib/Driver/DarwinLdDriver.cpp | 3 +-- lld/lib/Driver/Driver.cpp | 5 ++-- lld/lib/Driver/GnuLdDriver.cpp | 5 ++-- lld/lib/Driver/WinLinkDriver.cpp | 5 ++-- .../ReaderWriter/PECOFF/PECOFFLinkingContext.cpp | 9 +++---- 7 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 lld/include/lld/Driver/WrapperInputGraph.h diff --git a/lld/include/lld/Driver/WrapperInputGraph.h b/lld/include/lld/Driver/WrapperInputGraph.h deleted file mode 100644 index 8003d34..0000000 --- a/lld/include/lld/Driver/WrapperInputGraph.h +++ /dev/null @@ -1,29 +0,0 @@ -//===- lld/Driver/WrapperInputGraph.h - dummy InputGraph node -------------===// -// -// The LLVM Linker -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLD_DRIVER_WRAPPER_INPUT_GRAPH_H -#define LLD_DRIVER_WRAPPER_INPUT_GRAPH_H - -#include "lld/Core/InputGraph.h" -#include "lld/ReaderWriter/CoreLinkingContext.h" -#include "lld/ReaderWriter/Reader.h" -#include "llvm/Support/Errc.h" -#include -#include - -namespace lld { - -class WrapperNode : public FileNode { -public: - WrapperNode(std::unique_ptr f) : FileNode(std::move(f)) {} -}; - -} - -#endif diff --git a/lld/lib/Driver/CoreDriver.cpp b/lld/lib/Driver/CoreDriver.cpp index 1ecd147..a694821 100644 --- a/lld/lib/Driver/CoreDriver.cpp +++ b/lld/lib/Driver/CoreDriver.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "lld/Driver/Driver.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/ReaderWriter/CoreLinkingContext.h" #include "lld/ReaderWriter/Reader.h" #include "llvm/ADT/ArrayRef.h" @@ -155,7 +154,7 @@ bool CoreDriver::parse(int argc, const char *argv[], CoreLinkingContext &ctx, = loadFile(ctx, inputArg->getValue(), false); for (std::unique_ptr &file : files) { inputGraph->addInputElement(std::unique_ptr( - new WrapperNode(std::move(file)))); + new FileNode(std::move(file)))); } break; } diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp index 1695812..494fe5f 100644 --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -17,7 +17,6 @@ #include "lld/Core/ArchiveLibraryFile.h" #include "lld/Core/SharedLibraryFile.h" #include "lld/Driver/Driver.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/ReaderWriter/MachOLinkingContext.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" @@ -121,7 +120,7 @@ static void addFile(StringRef path, std::unique_ptr &inputGraph, loadFile(ctx, path, diag, loadWholeArchive, upwardDylib); for (std::unique_ptr &file : files) inputGraph->addInputElement( - llvm::make_unique(std::move(file))); + llvm::make_unique(std::move(file))); } // Export lists are one symbol per line. Blank lines are ignored. diff --git a/lld/lib/Driver/Driver.cpp b/lld/lib/Driver/Driver.cpp index 5d9d680..c21396f 100644 --- a/lld/lib/Driver/Driver.cpp +++ b/lld/lib/Driver/Driver.cpp @@ -15,7 +15,6 @@ #include "lld/Core/PassManager.h" #include "lld/Core/Resolver.h" #include "lld/Driver/Driver.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/Passes/RoundTripNativePass.h" #include "lld/Passes/RoundTripYAMLPass.h" #include "lld/ReaderWriter/Reader.h" @@ -120,7 +119,7 @@ bool Driver::link(LinkingContext &context, raw_ostream &diagnostics) { context.createInternalFiles(internalFiles); for (auto i = internalFiles.rbegin(), e = internalFiles.rend(); i != e; ++i) { context.getInputGraph().addInputElementFront( - llvm::make_unique(std::move(*i))); + llvm::make_unique(std::move(*i))); } // Give target a chance to add files. @@ -128,7 +127,7 @@ bool Driver::link(LinkingContext &context, raw_ostream &diagnostics) { context.createImplicitFiles(implicitFiles); for (auto i = implicitFiles.rbegin(), e = implicitFiles.rend(); i != e; ++i) { context.getInputGraph().addInputElementFront( - llvm::make_unique(std::move(*i))); + llvm::make_unique(std::move(*i))); } // Give target a chance to sort the input files. diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp index 871c5c9..283e658 100644 --- a/lld/lib/Driver/GnuLdDriver.cpp +++ b/lld/lib/Driver/GnuLdDriver.cpp @@ -14,7 +14,6 @@ //===----------------------------------------------------------------------===// #include "lld/Driver/Driver.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/ReaderWriter/ELFLinkingContext.h" #include "lld/ReaderWriter/LinkerScript.h" #include "llvm/ADT/ArrayRef.h" @@ -276,7 +275,7 @@ evaluateLinkerScript(ELFLinkingContext &ctx, InputGraph *inputGraph, if (ctx.logInputFiles()) diag << file->path() << "\n"; inputGraph->addInputElement( - std::unique_ptr(new WrapperNode(std::move(file)))); + std::unique_ptr(new FileNode(std::move(file)))); ++numfiles; } } @@ -617,7 +616,7 @@ bool GnuLdDriver::parse(int argc, const char *argv[], if (ctx->logInputFiles()) diagnostics << file->path() << "\n"; inputGraph->addInputElement( - std::unique_ptr(new WrapperNode(std::move(file)))); + std::unique_ptr(new FileNode(std::move(file)))); } numfiles += files.size(); break; diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp index 5723ea7..2286e2c 100644 --- a/lld/lib/Driver/WinLinkDriver.cpp +++ b/lld/lib/Driver/WinLinkDriver.cpp @@ -15,7 +15,6 @@ #include "lld/Driver/Driver.h" #include "lld/Driver/WinLinkModuleDef.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/Optional.h" @@ -1418,7 +1417,7 @@ bool WinLinkDriver::parse(int argc, const char *argv[], return false; ctx.getResolvableSymsFile()->add(file.get()); ctx.getInputGraph().addInputElement( - std::unique_ptr(new WrapperNode(std::move(file)))); + std::unique_ptr(new FileNode(std::move(file)))); } // Add the library group to the input graph. @@ -1435,7 +1434,7 @@ bool WinLinkDriver::parse(int argc, const char *argv[], return false; ctx.getResolvableSymsFile()->add(file.get()); ctx.addLibraryFile( - std::unique_ptr(new WrapperNode(std::move(file)))); + std::unique_ptr(new FileNode(std::move(file)))); } } diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp index 5fa53fd..24fae0a 100644 --- a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp @@ -17,7 +17,6 @@ #include "PDBPass.h" #include "lld/Core/PassManager.h" #include "lld/Core/Simple.h" -#include "lld/Driver/WrapperInputGraph.h" #include "lld/Passes/LayoutPass.h" #include "lld/Passes/RoundTripNativePass.h" #include "lld/Passes/RoundTripYAMLPass.h" @@ -110,22 +109,22 @@ bool PECOFFLinkingContext::createImplicitFiles( pecoff::ResolvableSymbols* syms = getResolvableSymsFile(); // Create a file for the entry point function. - std::unique_ptr entry(new WrapperNode( + std::unique_ptr entry(new FileNode( llvm::make_unique(*this, syms))); getInputGraph().addInputElementFront(std::move(entry)); // Create a file for __ImageBase. - std::unique_ptr fileNode(new WrapperNode( + std::unique_ptr fileNode(new FileNode( llvm::make_unique(*this))); getInputGraph().addInputElement(std::move(fileNode)); // Create a file for _imp_ symbols. - std::unique_ptr impFileNode(new WrapperNode( + std::unique_ptr impFileNode(new FileNode( llvm::make_unique(*this))); getInputGraph().addInputElement(std::move(impFileNode)); // Create a file for dllexported symbols. - std::unique_ptr exportNode(new WrapperNode( + std::unique_ptr exportNode(new FileNode( llvm::make_unique(*this, syms))); addLibraryFile(std::move(exportNode)); -- 2.7.4