[libc] Use std::optional instead of llvm::Optional (NFC)

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
This commit is contained in:
Kazu Hirata 2023-01-14 20:52:00 -08:00
parent e1cdda57fa
commit b5516be056
5 changed files with 14 additions and 14 deletions

View File

@ -32,12 +32,12 @@
#include "benchmark/benchmark.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
#include <array>
#include <chrono>
#include <cmath>
#include <cstdint>
#include <optional>
namespace llvm {
namespace libc_benchmarks {

View File

@ -8,12 +8,12 @@
#include "LibcBenchmark.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include <chrono>
#include <limits>
#include <optional>
#include <queue>
#include <vector>

View File

@ -13,8 +13,8 @@
#include <cstddef>
#include <llvm/ADT/ArrayRef.h>
#include <llvm/ADT/Hashing.h>
#include <llvm/ADT/Optional.h>
#include <llvm/ADT/StringRef.h>
#include <optional>
#include <tuple>
namespace llvm {
@ -127,11 +127,11 @@ enum class FunctionType {
// every detail but is enough to uniquely identify the implementation.
struct FunctionDescriptor {
FunctionType Type;
Optional<Contiguous> Contiguous;
Optional<Overlap> Overlap;
Optional<Loop> Loop;
Optional<AlignedLoop> AlignedLoop;
Optional<Accelerator> Accelerator;
std::optional<Contiguous> Contiguous;
std::optional<Overlap> Overlap;
std::optional<Loop> Loop;
std::optional<AlignedLoop> AlignedLoop;
std::optional<Accelerator> Accelerator;
ElementTypeClass ElementClass;
COMPARABLE_AND_HASHABLE(FunctionDescriptor, Type, Contiguous, Overlap, Loop,

View File

@ -13,8 +13,8 @@
#include <cstddef>
#include <cstdint>
#include <llvm/ADT/ArrayRef.h>
#include <llvm/ADT/Optional.h>
#include <llvm/ADT/StringRef.h>
#include <optional>
#include <vector>
#include <z3++.h>
@ -27,7 +27,7 @@ struct RandomFunctionGenerator {
RandomFunctionGenerator();
// Get the next valid FunctionDescriptor or std::nullopt.
Optional<FunctionDescriptor> next();
std::optional<FunctionDescriptor> next();
private:
// Returns an expression where `Variable` is forced to be one of the `Values`.

View File

@ -37,11 +37,11 @@
#include "automemcpy/CodeGen.h"
#include <cassert>
#include <llvm/ADT/Optional.h>
#include <llvm/ADT/STLExtras.h>
#include <llvm/ADT/StringSet.h>
#include <llvm/Support/FormatVariadic.h>
#include <llvm/Support/raw_ostream.h>
#include <optional>
#include <set>
namespace llvm {
@ -126,9 +126,9 @@ struct FunctionImplementation {
StringRef Name;
std::vector<Individual> Individuals;
std::vector<Overlap> Overlaps;
Optional<Loop> Loop;
Optional<AlignedLoop> AlignedLoop;
Optional<Accelerator> Accelerator;
std::optional<Loop> Loop;
std::optional<AlignedLoop> AlignedLoop;
std::optional<Accelerator> Accelerator;
ElementTypeClass ElementClass;
};