aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-01-18 19:37:11 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-01-18 19:37:11 +0000
commit92d8cc636266042470532449bb1f83fb743111cd (patch)
tree374de6605c1002ef5a447123c26ecd89a0ea189d
parent6d49b680be6e24b547e6910c2b64914913915084 (diff)
downloadexternal_llvm-92d8cc636266042470532449bb1f83fb743111cd.zip
external_llvm-92d8cc636266042470532449bb1f83fb743111cd.tar.gz
external_llvm-92d8cc636266042470532449bb1f83fb743111cd.tar.bz2
[Linker] Kill Linker::LoadObject which is dead, and drop the BitReader dependency again.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172838 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Linker.h4
-rw-r--r--lib/Linker/LLVMBuild.txt2
-rw-r--r--lib/Linker/Linker.cpp23
3 files changed, 1 insertions, 28 deletions
diff --git a/include/llvm/Linker.h b/include/llvm/Linker.h
index d5dd8ec..1537d30 100644
--- a/include/llvm/Linker.h
+++ b/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/lib/Linker/LLVMBuild.txt b/lib/Linker/LLVMBuild.txt
index 360c254..0bb26d0 100644
--- a/lib/Linker/LLVMBuild.txt
+++ b/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/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index bfd6596..c8ea8ff 100644
--- a/lib/Linker/Linker.cpp
+++ b/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>();
-}