From 1cb7fba3e57d6c31f05c7a2bda1634da49dd1d18 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 10 Dec 2022 12:35:02 -0800 Subject: [PATCH] [StaticAnalyzer] Don't use Optional::create (NFC) std::optional does not have an equivalent method. 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 --- clang/lib/StaticAnalyzer/Core/RegionStore.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp index f5959b2..db8a5c5 100644 --- a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp +++ b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp @@ -263,11 +263,13 @@ public: typedef const RegionBindingsRef& RegionBindingsConstRef; Optional RegionBindingsRef::getDirectBinding(const MemRegion *R) const { - return Optional::create(lookup(R, BindingKey::Direct)); + const SVal *V = lookup(R, BindingKey::Direct); + return V ? Optional(*V) : std::nullopt; } Optional RegionBindingsRef::getDefaultBinding(const MemRegion *R) const { - return Optional::create(lookup(R, BindingKey::Default)); + const SVal *V = lookup(R, BindingKey::Default); + return V ? Optional(*V) : std::nullopt; } RegionBindingsRef RegionBindingsRef::addBinding(BindingKey K, SVal V) const { -- 2.7.4