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/lib/Frontend/PrecompiledPreamble.cpp | |
| 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/lib/Frontend/PrecompiledPreamble.cpp')
| -rw-r--r-- | clang/lib/Frontend/PrecompiledPreamble.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Frontend/PrecompiledPreamble.cpp b/clang/lib/Frontend/PrecompiledPreamble.cpp index 276a9676eaa..55eb1ff069c 100644 --- a/clang/lib/Frontend/PrecompiledPreamble.cpp +++ b/clang/lib/Frontend/PrecompiledPreamble.cpp @@ -369,9 +369,11 @@ llvm::ErrorOr<PrecompiledPreamble> PrecompiledPreamble::Build( SourceManager &SourceMgr = Clang->getSourceManager(); for (auto &Filename : PreambleDepCollector->getDependencies()) { - const FileEntry *File = Clang->getFileManager().getFile(Filename); - if (!File || File == SourceMgr.getFileEntryForID(SourceMgr.getMainFileID())) + auto FileOrErr = Clang->getFileManager().getFile(Filename); + if (!FileOrErr || + *FileOrErr == SourceMgr.getFileEntryForID(SourceMgr.getMainFileID())) continue; + auto File = *FileOrErr; if (time_t ModTime = File->getModificationTime()) { FilesInPreamble[File->getName()] = PrecompiledPreamble::PreambleFileHash::createForFile(File->getSize(), |
