From 44158478bb5818ed7e7aad0b0eb98dfc7ff74b39 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 18 Nov 2007 18:52:28 +0000 Subject: Fix the Linker testcase regressions, by making MemoryBuffer::getFileOrSTDIN return a valid but empty buffer if stdin is empty. llvm-svn: 44219 --- llvm/lib/Support/MemoryBuffer.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'llvm/lib/Support/MemoryBuffer.cpp') diff --git a/llvm/lib/Support/MemoryBuffer.cpp b/llvm/lib/Support/MemoryBuffer.cpp index f8779e1..20003777 100644 --- a/llvm/lib/Support/MemoryBuffer.cpp +++ b/llvm/lib/Support/MemoryBuffer.cpp @@ -117,6 +117,24 @@ MemoryBuffer *MemoryBuffer::getNewMemBuffer(unsigned Size, } +/// getFileOrSTDIN - Open the specified file as a MemoryBuffer, or open stdin +/// if the Filename is "-". If an error occurs, this returns null and fills +/// in *ErrStr with a reason. If stdin is empty, this API (unlike getSTDIN) +/// returns an empty buffer. +MemoryBuffer *MemoryBuffer::getFileOrSTDIN(const char *FilenameStart, + unsigned FnSize, + std::string *ErrStr, + int64_t FileSize) { + if (FnSize != 1 || FilenameStart[0] != '-') + return getFile(FilenameStart, FnSize, ErrStr, FileSize); + MemoryBuffer *M = getSTDIN(); + if (M) return M; + + // If stdin was empty, M is null. Cons up an empty memory buffer now. + const char *EmptyStr = ""; + return MemoryBuffer::getMemBuffer(EmptyStr, EmptyStr, ""); +} + //===----------------------------------------------------------------------===// // MemoryBufferMMapFile implementation. //===----------------------------------------------------------------------===// -- cgit v1.1