From 343523d040d1ede65a35d8a6d514b0f7c198a3f2 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sun, 4 Dec 2022 16:51:25 -0800 Subject: [lldb] Use std::nullopt instead of None (NFC) This patch mechanically replaces None with std::nullopt where the compiler would warn if None were deprecated. The intent is to reduce the amount of manual work required in migrating from Optional to std::optional. This is part of an effort to migrate from llvm::Optional to std::optional: https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716 --- lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp') diff --git a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp index 905e9637493b..a8f47ffedd40 100644 --- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp +++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp @@ -57,18 +57,18 @@ GetWasmString(llvm::DataExtractor &data, llvm::DataExtractor::Cursor &c) { uint64_t len = data.getULEB128(c); if (!c) { consumeError(c.takeError()); - return llvm::None; + return std::nullopt; } if (len >= (uint64_t(1) << 32)) { - return llvm::None; + return std::nullopt; } llvm::SmallVector str_storage; data.getU8(c, str_storage, len); if (!c) { consumeError(c.takeError()); - return llvm::None; + return std::nullopt; } llvm::StringRef str = toStringRef(makeArrayRef(str_storage)); @@ -427,7 +427,7 @@ llvm::Optional ObjectFileWasm::GetExternalDebugInfoFileSpec() { return FileSpec(symbols_url->GetStringRef()); } } - return llvm::None; + return std::nullopt; } void ObjectFileWasm::Dump(Stream *s) { -- cgit v1.2.3