diff options
author | Daniel Dunbar <daniel@zuster.org> | 2013-01-18 19:37:11 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2013-01-18 19:37:11 +0000 |
commit | a32a546dcbb13af21bf18f3a49a168beb4dca67e (patch) | |
tree | 9590343e9fc62f84a916638cb3fe0dfb7772003f | |
parent | 95856128766cf3bd5cda843f70616554666515aa (diff) | |
download | bcm5719-llvm-a32a546dcbb13af21bf18f3a49a168beb4dca67e.tar.gz bcm5719-llvm-a32a546dcbb13af21bf18f3a49a168beb4dca67e.zip |
[Linker] Kill Linker::LoadObject which is dead, and drop the BitReader dependency again.
llvm-svn: 172838
-rw-r--r-- | llvm/include/llvm/Linker.h | 4 | ||||
-rw-r--r-- | llvm/lib/Linker/LLVMBuild.txt | 2 | ||||
-rw-r--r-- | llvm/lib/Linker/Linker.cpp | 23 |
3 files changed, 1 insertions, 28 deletions
diff --git a/llvm/include/llvm/Linker.h b/llvm/include/llvm/Linker.h index d5dd8ec7f1b..1537d309b8d 100644 --- a/llvm/include/llvm/Linker.h +++ b/llvm/include/llvm/Linker.h @@ -185,10 +185,6 @@ class Linker { /// @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); diff --git a/llvm/lib/Linker/LLVMBuild.txt b/llvm/lib/Linker/LLVMBuild.txt index 360c254bbef..0bb26d0c2ae 100644 --- a/llvm/lib/Linker/LLVMBuild.txt +++ b/llvm/lib/Linker/LLVMBuild.txt @@ -19,4 +19,4 @@ type = Library name = Linker parent = Libraries -required_libraries = BitReader Core Support TransformUtils +required_libraries = Core Support TransformUtils diff --git a/llvm/lib/Linker/Linker.cpp b/llvm/lib/Linker/Linker.cpp index bfd65967a07..c8ea8ff0a9e 100644 --- a/llvm/lib/Linker/Linker.cpp +++ b/llvm/lib/Linker/Linker.cpp @@ -89,26 +89,3 @@ Linker::releaseModule() { 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>(); -} |