Update for llvm api change.
llvm-svn: 212406
diff --git a/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
index 7064bfe..3929806 100644
--- a/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
+++ b/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
@@ -59,15 +59,15 @@
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-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp
index b5cf5bb..c3a7d68 100644
--- a/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp
+++ b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.cpp
@@ -123,23 +123,27 @@
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/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp
index e4841cc..db67754 100644
--- a/clang-tools-extra/modularize/Modularize.cpp
+++ b/clang-tools-extra/modularize/Modularize.cpp
@@ -230,14 +230,14 @@
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(),