From aea9b2adcddea6595548b65ad4e8a70d9e4de04c Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Fri, 19 Jun 2026 03:50:29 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 934844207
---
 eval/compiler/flat_expr_builder.cc                 |  2 +-
 eval/compiler/flat_expr_builder_extensions.cc      |  6 +++---
 eval/compiler/qualified_reference_resolver.cc      | 10 +++++-----
 eval/compiler/regex_precompilation_optimization.cc |  4 ++--
 eval/compiler/resolver.cc                          |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eval/compiler/flat_expr_builder.cc b/eval/compiler/flat_expr_builder.cc
index fc6d87b16..aa9a8858c 100644
--- a/eval/compiler/flat_expr_builder.cc
+++ b/eval/compiler/flat_expr_builder.cc
@@ -1078,7 +1078,7 @@ class FlatExprVisitor : public cel::AstVisitor {
   // eligible for recursion, or nullopt if it is not.
   std::optional<int> RecursionEligible() {
     if (!PlanRecursiveProgram() || program_builder_.current() == nullptr) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     return program_builder_.current()->RecursiveDependencyDepth();
   }
diff --git a/eval/compiler/flat_expr_builder_extensions.cc b/eval/compiler/flat_expr_builder_extensions.cc
index e51b64023..ee106ff4a 100644
--- a/eval/compiler/flat_expr_builder_extensions.cc
+++ b/eval/compiler/flat_expr_builder_extensions.cc
@@ -102,15 +102,15 @@ std::optional<int> Subexpression::RecursiveDependencyDepth() const {
   auto* tree = absl::get_if<TreePlan>(&program_);
   int depth = 0;
   if (tree == nullptr) {
-    return absl::nullopt;
+    return std::nullopt;
   }
   for (const auto& element : *tree) {
     auto* subexpression = absl::get_if<Subexpression*>(&element);
     if (subexpression == nullptr) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     if (!(*subexpression)->IsRecursive()) {
-      return absl::nullopt;
+      return std::nullopt;
     }
     depth = std::max(depth, (*subexpression)->recursive_program().depth);
   }
diff --git a/eval/compiler/qualified_reference_resolver.cc b/eval/compiler/qualified_reference_resolver.cc
index 67c14d9b2..158e492be 100644
--- a/eval/compiler/qualified_reference_resolver.cc
+++ b/eval/compiler/qualified_reference_resolver.cc
@@ -99,7 +99,7 @@ std::optional<std::string> BestOverloadMatch(const Resolver& resolver,
       return *name;
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 // Rewriter visitor for resolving references.
@@ -267,22 +267,22 @@ class ReferenceResolver : public cel::AstRewriterBase {
     if (rewritten_reference_.find(expr.id()) != rewritten_reference_.end()) {
       // The target expr matches a reference (resolved to an ident decl).
       // This should not be treated as a function qualifier.
-      return absl::nullopt;
+      return std::nullopt;
     }
     if (expr.has_ident_expr()) {
       return expr.ident_expr().name();
     } else if (expr.has_select_expr()) {
       if (expr.select_expr().test_only()) {
-        return absl::nullopt;
+        return std::nullopt;
       }
       maybe_parent_namespace = ToNamespace(expr.select_expr().operand());
       if (!maybe_parent_namespace.has_value()) {
-        return absl::nullopt;
+        return std::nullopt;
       }
       return absl::StrCat(*maybe_parent_namespace, ".",
                           expr.select_expr().field());
     } else {
-      return absl::nullopt;
+      return std::nullopt;
     }
   }
 
diff --git a/eval/compiler/regex_precompilation_optimization.cc b/eval/compiler/regex_precompilation_optimization.cc
index 455796131..38ef842b9 100644
--- a/eval/compiler/regex_precompilation_optimization.cc
+++ b/eval/compiler/regex_precompilation_optimization.cc
@@ -178,7 +178,7 @@ class RegexPrecompilationOptimization : public ProgramOptimizer {
 
     if (subexpression == nullptr || subexpression->IsFlattened()) {
       // Already modified, can't recover the input pattern.
-      return absl::nullopt;
+      return std::nullopt;
     }
     std::optional<Value> constant;
     if (subexpression->IsRecursive()) {
@@ -206,7 +206,7 @@ class RegexPrecompilationOptimization : public ProgramOptimizer {
       return Cast<StringValue>(*constant).ToString();
     }
 
-    return absl::nullopt;
+    return std::nullopt;
   }
 
   absl::Status RewritePlan(
diff --git a/eval/compiler/resolver.cc b/eval/compiler/resolver.cc
index 17f60eaad..cca72964a 100644
--- a/eval/compiler/resolver.cc
+++ b/eval/compiler/resolver.cc
@@ -128,7 +128,7 @@ std::optional<cel::Value> Resolver::FindConstant(absl::string_view name,
       return TypeValue(**type_value);
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 std::vector<cel::FunctionOverloadReference> Resolver::FindOverloads(
@@ -216,7 +216,7 @@ Resolver::FindType(absl::string_view name, int64_t expr_id) const {
       return std::make_pair(std::move(qualified_name), std::move(*maybe_type));
     }
   }
-  return absl::nullopt;
+  return std::nullopt;
 }
 
 }  // namespace google::api::expr::runtime