6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix the Linker testcase regressions, by making MemoryBuffer::getFileOrSTDIN return

Browse Source 
a valid but empty buffer if stdin is empty.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44219 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-11-18 18:52:28 +00:00
parent 4ce0df6108
commit 2b1f1066ac
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Support/MemoryBuffer.h
View File

@ -88,14 +88,11 @@ public:
/// 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.
/// in *ErrStr with a reason. If stdin is empty, this API (unlike getSTDIN)
/// returns an empty buffer.
static MemoryBuffer *getFileOrSTDIN(const char *FilenameStart,unsigned FnSize,
std::string *ErrStr = 0,
int64_t FileSize = -1) {
if (FnSize == 1 && FilenameStart[0] == '-')
return getSTDIN();
return getFile(FilenameStart, FnSize, ErrStr, FileSize);
}
int64_t FileSize = -1);
/// getFileOrSTDIN - Open the specified file as a MemoryBuffer, or open stdin
/// if the Filename is "-". If an error occurs, this returns null and fills

18
lib/Support/MemoryBuffer.cpp
View File

@ -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, "<stdin>");
}
//===----------------------------------------------------------------------===//
// MemoryBufferMMapFile implementation.
//===----------------------------------------------------------------------===//