aboutsummaryrefslogtreecommitdiff
path: root/clang-tools-extra/clang-apply-replacements
diff options
context:
space:
mode:
authorHarlan Haskins <harlan@harlanhaskins.com>2019-08-01 21:32:01 +0000
committerHarlan Haskins <harlan@harlanhaskins.com>2019-08-01 21:32:01 +0000
commita02f85768d2d1a77c7735ddd43226e1be51f3730 (patch)
tree331b92c088cb3249848f387a358206770da95180 /clang-tools-extra/clang-apply-replacements
parent8d323d150610bed1feeb79d7a29c9958a4c8bcac (diff)
downloadllvm-a02f85768d2d1a77c7735ddd43226e1be51f3730.zip
llvm-a02f85768d2d1a77c7735ddd43226e1be51f3730.tar.gz
llvm-a02f85768d2d1a77c7735ddd43226e1be51f3730.tar.bz2
[clang-tools-extra] Adopt FileManager's error-returning APIs
The FileManager has been updated to return llvm::ErrorOr from getFile and getDirectory, this commit updates all the callers of those APIs from clang. llvm-svn: 367617
Diffstat (limited to 'clang-tools-extra/clang-apply-replacements')
-rw-r--r--clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp6
1 files changed, 3 insertions, 3 deletions
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 4a6707b..6a83664 100644
--- a/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
+++ b/clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
@@ -151,13 +151,13 @@ groupReplacements(const TUReplacements &TUs, const TUDiagnostics &TUDs,
auto AddToGroup = [&](const tooling::Replacement &R, bool FromDiag) {
// Use the file manager to deduplicate paths. FileEntries are
// automatically canonicalized.
- if (const FileEntry *Entry = SM.getFileManager().getFile(R.getFilePath())) {
+ if (auto Entry = SM.getFileManager().getFile(R.getFilePath())) {
if (FromDiag) {
- auto &Replaces = DiagReplacements[Entry];
+ auto &Replaces = DiagReplacements[*Entry];
if (!Replaces.insert(R).second)
return;
}
- GroupedReplacements[Entry].push_back(R);
+ GroupedReplacements[*Entry].push_back(R);
} else if (Warned.insert(R.getFilePath()).second) {
errs() << "Described file '" << R.getFilePath()
<< "' doesn't exist. Ignoring...\n";