[llvm-commits] [llvm] r172838 - in /llvm/trunk: include/llvm/Linker.h lib/Linker/LLVMBuild.txt lib/Linker/Linker.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jan 18 13:37:11 2013
New Revision: 172838

URL: http://llvm.org/viewvc/llvm-project?rev=172838&view=rev
Log:
[Linker] Kill Linker::LoadObject which is dead, and drop the BitReader dependency again.

Modified:
    llvm/trunk/include/llvm/Linker.h
    llvm/trunk/lib/Linker/LLVMBuild.txt
    llvm/trunk/lib/Linker/Linker.cpp

Modified: llvm/trunk/include/llvm/Linker.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Linker.h?rev=172838&r1=172837&r2=172838&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Linker.h (original)
+++ llvm/trunk/include/llvm/Linker.h Fri Jan 18 13:37:11 2013
@@ -185,10 +185,6 @@
   /// @name Implementation
   /// @{
   private:
-    /// Read in and parse the bitcode file named by FN and return the
-    /// Module it contains (wrapped in an auto_ptr), or 0 if an error occurs.
-    std::auto_ptr<Module> LoadObject(const sys::Path& FN);
-
     bool warning(StringRef message);
     bool error(StringRef message);
     void verbose(StringRef message);

Modified: llvm/trunk/lib/Linker/LLVMBuild.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LLVMBuild.txt?rev=172838&r1=172837&r2=172838&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/LLVMBuild.txt (original)
+++ llvm/trunk/lib/Linker/LLVMBuild.txt Fri Jan 18 13:37:11 2013
@@ -19,4 +19,4 @@
 type = Library
 name = Linker
 parent = Libraries
-required_libraries = BitReader Core Support TransformUtils
+required_libraries = Core Support TransformUtils

Modified: llvm/trunk/lib/Linker/Linker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/Linker.cpp?rev=172838&r1=172837&r2=172838&view=diff
==============================================================================
--- llvm/trunk/lib/Linker/Linker.cpp (original)
+++ llvm/trunk/lib/Linker/Linker.cpp Fri Jan 18 13:37:11 2013
@@ -89,26 +89,3 @@
   Flags = 0;
   return result;
 }
-
-// LoadObject - Read in and parse the bitcode file named by FN and return the
-// module it contains (wrapped in an auto_ptr), or auto_ptr<Module>() and set
-// Error if an error occurs.
-std::auto_ptr<Module>
-Linker::LoadObject(const sys::Path &FN) {
-  std::string ParseErrorMessage;
-  Module *Result = 0;
-
-  OwningPtr<MemoryBuffer> Buffer;
-  if (error_code ec = MemoryBuffer::getFileOrSTDIN(FN.c_str(), Buffer))
-    ParseErrorMessage = "Error reading file '" + FN.str() + "'" + ": "
-                      + ec.message();
-  else
-    Result = ParseBitcodeFile(Buffer.get(), Context, &ParseErrorMessage);
-
-  if (Result)
-    return std::auto_ptr<Module>(Result);
-  Error = "Bitcode file '" + FN.str() + "' could not be loaded";
-  if (ParseErrorMessage.size())
-    Error += ": " + ParseErrorMessage;
-  return std::auto_ptr<Module>();
-}