[lld] r262422 - Remove dead code.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 1 15:48:03 PST 2016


Author: ruiu
Date: Tue Mar  1 17:48:03 2016
New Revision: 262422

URL: http://llvm.org/viewvc/llvm-project?rev=262422&view=rev
Log:
Remove dead code.

Modified:
    lld/trunk/include/lld/Driver/Driver.h
    lld/trunk/lib/Driver/Driver.cpp

Modified: lld/trunk/include/lld/Driver/Driver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/Driver.h?rev=262422&r1=262421&r2=262422&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/Driver.h (original)
+++ lld/trunk/include/lld/Driver/Driver.h Tue Mar  1 17:48:03 2016
@@ -34,7 +34,6 @@ typedef std::vector<std::unique_ptr<File
 
 FileVector makeErrorFile(StringRef path, std::error_code ec);
 FileVector parseMemberFiles(std::unique_ptr<File> File);
-FileVector loadFile(LinkingContext &ctx, StringRef path, bool wholeArchive);
 
 /// Base class for all Drivers.
 class Driver {

Modified: lld/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/Driver.cpp?rev=262422&r1=262421&r2=262422&view=diff
==============================================================================
--- lld/trunk/lib/Driver/Driver.cpp (original)
+++ lld/trunk/lib/Driver/Driver.cpp Tue Mar  1 17:48:03 2016
@@ -46,23 +46,6 @@ FileVector parseMemberFiles(std::unique_
   return members;
 }
 
-FileVector loadFile(LinkingContext &ctx, StringRef path, bool wholeArchive) {
-  ErrorOr<std::unique_ptr<MemoryBuffer>> mb
-      = MemoryBuffer::getFileOrSTDIN(path);
-  if (std::error_code ec = mb.getError())
-    return makeErrorFile(path, ec);
-  ErrorOr<std::unique_ptr<File>> fileOrErr =
-      ctx.registry().loadFile(std::move(mb.get()));
-  if (std::error_code ec = fileOrErr.getError())
-    return makeErrorFile(path, ec);
-  std::unique_ptr<File> &file = fileOrErr.get();
-  if (wholeArchive)
-    return parseMemberFiles(std::move(file));
-  std::vector<std::unique_ptr<File>> files;
-  files.push_back(std::move(file));
-  return files;
-}
-
 void Driver::parseLLVMOptions(const LinkingContext &ctx) {
   // Honor -mllvm
   if (!ctx.llvmOptions().empty()) {




More information about the llvm-commits mailing list