diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:13 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:13 +0000 |
| commit | adf21f2a5634f2b33b6aa2dffae67df50c72a9f2 (patch) | |
| tree | ab58d9d0ff55fb26656a0152b43539b19657b9dc /llvm/lib/Support/CommandLine.cpp | |
| parent | 178cadafc1a7fc576b6f4eb86a598c24247ccad7 (diff) | |
| download | bcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.tar.gz bcm5719-llvm-adf21f2a5634f2b33b6aa2dffae67df50c72a9f2.zip | |
Update the MemoryBuffer API to use ErrorOr.
llvm-svn: 212405
Diffstat (limited to 'llvm/lib/Support/CommandLine.cpp')
| -rw-r--r-- | llvm/lib/Support/CommandLine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp index c2b739fa736..87348f7342e 100644 --- a/llvm/lib/Support/CommandLine.cpp +++ b/llvm/lib/Support/CommandLine.cpp @@ -631,9 +631,11 @@ void cl::TokenizeWindowsCommandLine(StringRef Src, StringSaver &Saver, static bool ExpandResponseFile(const char *FName, StringSaver &Saver, TokenizerCallback Tokenizer, SmallVectorImpl<const char *> &NewArgv) { - std::unique_ptr<MemoryBuffer> MemBuf; - if (MemoryBuffer::getFile(FName, MemBuf)) + ErrorOr<std::unique_ptr<MemoryBuffer>> MemBufOrErr = + MemoryBuffer::getFile(FName); + if (!MemBufOrErr) return false; + std::unique_ptr<MemoryBuffer> MemBuf = std::move(MemBufOrErr.get()); StringRef Str(MemBuf->getBufferStart(), MemBuf->getBufferSize()); // If we have a UTF-16 byte order mark, convert to UTF-8 for parsing. |
