summaryrefslogtreecommitdiff
path: root/lib/Linker
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-11-10 00:43:58 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-11-10 00:43:58 +0000
commitd65267ee625bb9cf8dc655a0c0409760e2b76c71 (patch)
tree50e8a65a2608845d4b1ea618b68a672d452fb725 /lib/Linker
parent0855dee564f80160abf95497475306af38ab7f84 (diff)
downloadllvm-d65267ee625bb9cf8dc655a0c0409760e2b76c71.tar.gz
llvm-d65267ee625bb9cf8dc655a0c0409760e2b76c71.tar.bz2
llvm-d65267ee625bb9cf8dc655a0c0409760e2b76c71.tar.xz
Fix MemoryBuffer::getSTDIN to *not* return null if stdin is empty, this is a lame API.
Also, Stringrefify some more MemoryBuffer functions, and add two performance FIXMEs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@86630 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
-rw-r--r--lib/Linker/LinkItems.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp
index 7213659047..2c225503d6 100644
--- a/lib/Linker/LinkItems.cpp
+++ b/lib/Linker/LinkItems.cpp
@@ -160,14 +160,17 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) {
// Check for a file of name "-", which means "read standard input"
if (File.str() == "-") {
std::auto_ptr<Module> M;
- if (MemoryBuffer *Buffer = MemoryBuffer::getSTDIN()) {
+ MemoryBuffer *Buffer = MemoryBuffer::getSTDIN();
+ if (!Buffer->getBufferSize()) {
+ delete Buffer;
+ Error = "standard input is empty";
+ } else {
M.reset(ParseBitcodeFile(Buffer, Context, &Error));
delete Buffer;
if (M.get())
if (!LinkInModule(M.get(), &Error))
return false;
- } else
- Error = "standard input is empty";
+ }
return error("Cannot link stdin: " + Error);
}