From 6ad0788c332bb2043142954d300c49ac3e537f34 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 14 Jan 2023 12:31:01 -0800 Subject: [clang] Use std::optional instead of llvm::Optional (NFC) This patch replaces (llvm::|)Optional< with std::optional<. I'll post a separate patch to remove #include "llvm/ADT/Optional.h". 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/CodeGen/BackendUtil.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'clang/lib/CodeGen/BackendUtil.cpp') diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 16b48c6..937a8dc 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -510,8 +510,8 @@ static bool initTargetOptions(DiagnosticsEngine &Diags, return true; } -static Optional getGCOVOptions(const CodeGenOptions &CodeGenOpts, - const LangOptions &LangOpts) { +static std::optional +getGCOVOptions(const CodeGenOptions &CodeGenOpts, const LangOptions &LangOpts) { if (!CodeGenOpts.EmitGcovArcs && !CodeGenOpts.EmitGcovNotes) return std::nullopt; // Not using 'GCOVOptions::getDefault' allows us to avoid exiting if @@ -527,7 +527,7 @@ static Optional getGCOVOptions(const CodeGenOptions &CodeGenOpts, return Options; } -static Optional +static std::optional getInstrProfOptions(const CodeGenOptions &CodeGenOpts, const LangOptions &LangOpts) { if (!CodeGenOpts.hasProfileClangInstr()) @@ -980,12 +980,13 @@ void EmitAssemblyHelper::RunOptimizationPipeline( addKCFIPass(TargetTriple, LangOpts, PB); } - if (Optional Options = getGCOVOptions(CodeGenOpts, LangOpts)) + if (std::optional Options = + getGCOVOptions(CodeGenOpts, LangOpts)) PB.registerPipelineStartEPCallback( [Options](ModulePassManager &MPM, OptimizationLevel Level) { MPM.addPass(GCOVProfilerPass(*Options)); }); - if (Optional Options = + if (std::optional Options = getInstrProfOptions(CodeGenOpts, LangOpts)) PB.registerPipelineStartEPCallback( [Options](ModulePassManager &MPM, OptimizationLevel Level) { -- cgit v1.1