diff options
| author | Harlan Haskins <harlan@harlanhaskins.com> | 2019-08-01 21:31:56 +0000 |
|---|---|---|
| committer | Harlan Haskins <harlan@harlanhaskins.com> | 2019-08-01 21:31:56 +0000 |
| commit | 8d323d150610bed1feeb79d7a29c9958a4c8bcac (patch) | |
| tree | 166514f9a8bba05ea1504afab5c319975a57675d /clang/tools/clang-refactor | |
| parent | 461f0722dd26487c1faa497ba37aabed1477a561 (diff) | |
| download | bcm5719-llvm-8d323d150610bed1feeb79d7a29c9958a4c8bcac.tar.gz bcm5719-llvm-8d323d150610bed1feeb79d7a29c9958a4c8bcac.zip | |
[clang] Adopt new FileManager error-returning APIs
Update the callers of FileManager::getFile and FileManager::getDirectory to handle the new llvm::ErrorOr-returning methods.
Signed-off-by: Harlan Haskins <harlan@apple.com>
llvm-svn: 367616
Diffstat (limited to 'clang/tools/clang-refactor')
| -rw-r--r-- | clang/tools/clang-refactor/ClangRefactor.cpp | 4 | ||||
| -rw-r--r-- | clang/tools/clang-refactor/TestSupport.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/tools/clang-refactor/ClangRefactor.cpp b/clang/tools/clang-refactor/ClangRefactor.cpp index f7ca39fcfec..68a5cce8db5 100644 --- a/clang/tools/clang-refactor/ClangRefactor.cpp +++ b/clang/tools/clang-refactor/ClangRefactor.cpp @@ -116,8 +116,8 @@ public: bool forAllRanges(const SourceManager &SM, llvm::function_ref<void(SourceRange R)> Callback) override { - const FileEntry *FE = SM.getFileManager().getFile(Range.FileName); - FileID FID = FE ? SM.translateFile(FE) : FileID(); + auto FE = SM.getFileManager().getFile(Range.FileName); + FileID FID = FE ? SM.translateFile(*FE) : FileID(); if (!FE || FID.isInvalid()) { llvm::errs() << "error: -selection=" << Range.FileName << ":... : given file is not in the target TU\n"; diff --git a/clang/tools/clang-refactor/TestSupport.cpp b/clang/tools/clang-refactor/TestSupport.cpp index bad640227f1..7d5d5471dcd 100644 --- a/clang/tools/clang-refactor/TestSupport.cpp +++ b/clang/tools/clang-refactor/TestSupport.cpp @@ -41,8 +41,8 @@ void TestSelectionRangesInFile::dump(raw_ostream &OS) const { bool TestSelectionRangesInFile::foreachRange( const SourceManager &SM, llvm::function_ref<void(SourceRange)> Callback) const { - const FileEntry *FE = SM.getFileManager().getFile(Filename); - FileID FID = FE ? SM.translateFile(FE) : FileID(); + auto FE = SM.getFileManager().getFile(Filename); + FileID FID = FE ? SM.translateFile(*FE) : FileID(); if (!FE || FID.isInvalid()) { llvm::errs() << "error: -selection=test:" << Filename << " : given file is not in the target TU"; |
