diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2022-12-20 00:15:11 +0100 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2022-12-20 00:41:40 +0100 |
| commit | 854c10f8d185286d941307e1033eb492e085c203 (patch) | |
| tree | d80b1b5ae1be07e2cbd1315f64e6ab2d36773847 /clang/lib/Serialization/ModuleManager.cpp | |
| parent | eddb7280462ca316ba8d4d9fa6f175e8e2e65b72 (diff) | |
| download | llvm-854c10f8d185286d941307e1033eb492e085c203.zip llvm-854c10f8d185286d941307e1033eb492e085c203.tar.gz llvm-854c10f8d185286d941307e1033eb492e085c203.tar.bz2 | |
[Clang] Prepare for llvm::Optional becoming std::optional.
The needed tweaks are mostly trivial, the one nasty bit is Clang's usage
of OptionalStorage. To keep this working old Optional stays around as
clang::CustomizableOptional, with the default Storage removed.
Optional<File/DirectoryEntryRef> is replaced with a typedef.
I tested this with GCC 7.5, the oldest supported GCC I had around.
Differential Revision: https://reviews.llvm.org/D140332
Diffstat (limited to 'clang/lib/Serialization/ModuleManager.cpp')
| -rw-r--r-- | clang/lib/Serialization/ModuleManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp index ae4ea61..81dd546 100644 --- a/clang/lib/Serialization/ModuleManager.cpp +++ b/clang/lib/Serialization/ModuleManager.cpp @@ -444,14 +444,14 @@ void ModuleManager::visit(llvm::function_ref<bool(ModuleFile &M)> Visitor, bool ModuleManager::lookupModuleFile(StringRef FileName, off_t ExpectedSize, time_t ExpectedModTime, - Optional<FileEntryRef> &File) { + OptionalFileEntryRef &File) { File = std::nullopt; if (FileName == "-") return false; // Open the file immediately to ensure there is no race between stat'ing and // opening the file. - Optional<FileEntryRef> FileOrErr = + OptionalFileEntryRef FileOrErr = expectedToOptional(FileMgr.getFileRef(FileName, /*OpenFile=*/true, /*CacheFailure=*/false)); if (!FileOrErr) |