diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:19 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-07-06 17:43:19 +0000 |
commit | 983c0bd0ae34dc452e04a51304bf6a3980db693d (patch) | |
tree | 8f29bdc33816e14c2be80159b07ee0895d179a15 | |
parent | 4d0369917ae5a5754553f39734a852d3691bc9a3 (diff) |
Update for llvm api change.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@212406 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp | 8 | ||||
-rw-r--r-- | clang-modernize/Core/IncludeExcludeInfo.cpp | 20 | ||||
-rw-r--r-- | modularize/Modularize.cpp | 10 |
3 files changed, 21 insertions, 17 deletions
diff --git a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp index 7064bfe7..39298062 100644 --- a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -59,15 +59,15 @@ collectReplacementsFromDirectory(const llvm::StringRef Directory, TURFiles.push_back(I->path()); - std::unique_ptr<MemoryBuffer> Out; - std::error_code BufferError = MemoryBuffer::getFile(I->path(), Out); - if (BufferError) { + ErrorOr<std::unique_ptr<MemoryBuffer>> Out = + MemoryBuffer::getFile(I->path()); + if (std::error_code BufferError = Out.getError()) { errs() << "Error reading " << I->path() << ": " << BufferError.message() << "\n"; continue; } - yaml::Input YIn(Out->getBuffer(), nullptr, &eatDiagnostics); + yaml::Input YIn(Out.get()->getBuffer(), nullptr, &eatDiagnostics); tooling::TranslationUnitReplacements TU; YIn >> TU; if (YIn.error()) { diff --git a/clang-modernize/Core/IncludeExcludeInfo.cpp b/clang-modernize/Core/IncludeExcludeInfo.cpp index b5cf5bbe..c3a7d684 100644 --- a/clang-modernize/Core/IncludeExcludeInfo.cpp +++ b/clang-modernize/Core/IncludeExcludeInfo.cpp @@ -123,23 +123,27 @@ std::error_code IncludeExcludeInfo::readListFromFile(StringRef IncludeListFile, StringRef ExcludeListFile) { if (!IncludeListFile.empty()) { - std::unique_ptr<MemoryBuffer> FileBuf; - if (std::error_code Err = MemoryBuffer::getFile(IncludeListFile, FileBuf)) { + ErrorOr<std::unique_ptr<MemoryBuffer>> FileBuf = + MemoryBuffer::getFile(IncludeListFile); + if (std::error_code Err = FileBuf.getError()) { errs() << "Unable to read from include file.\n"; return Err; } - if (std::error_code Err = parseCLInput(FileBuf->getBuffer(), IncludeList, - /*Separator=*/"\n")) + if (std::error_code Err = + parseCLInput(FileBuf.get()->getBuffer(), IncludeList, + /*Separator=*/"\n")) return Err; } if (!ExcludeListFile.empty()) { - std::unique_ptr<MemoryBuffer> FileBuf; - if (std::error_code Err = MemoryBuffer::getFile(ExcludeListFile, FileBuf)) { + ErrorOr<std::unique_ptr<MemoryBuffer>> FileBuf = + MemoryBuffer::getFile(ExcludeListFile); + if (std::error_code Err = FileBuf.getError()) { errs() << "Unable to read from exclude file.\n"; return Err; } - if (std::error_code Err = parseCLInput(FileBuf->getBuffer(), ExcludeList, - /*Separator=*/"\n")) + if (std::error_code Err = + parseCLInput(FileBuf.get()->getBuffer(), ExcludeList, + /*Separator=*/"\n")) return Err; } return std::error_code(); diff --git a/modularize/Modularize.cpp b/modularize/Modularize.cpp index e4841cca..db67754f 100644 --- a/modularize/Modularize.cpp +++ b/modularize/Modularize.cpp @@ -230,14 +230,14 @@ getHeaderFileNames(SmallVectorImpl<std::string> &HeaderFileNames, HeaderDirectory = HeaderPrefix; // Read the header list file into a buffer. - std::unique_ptr<MemoryBuffer> listBuffer; - if (std::error_code ec = MemoryBuffer::getFile(ListFileName, listBuffer)) { - return ec; - } + ErrorOr<std::unique_ptr<MemoryBuffer>> listBuffer = + MemoryBuffer::getFile(ListFileName); + if (std::error_code EC = listBuffer.getError()) + return EC; // Parse the header list into strings. SmallVector<StringRef, 32> Strings; - listBuffer->getBuffer().split(Strings, "\n", -1, false); + listBuffer.get()->getBuffer().split(Strings, "\n", -1, false); // Collect the header file names from the string list. for (SmallVectorImpl<StringRef>::iterator I = Strings.begin(), |