From 267f4de9814c320e61b20cdd8fbe6580f2e57ac3 Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Sat, 23 May 2026 02:51:01 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 920105999
---
 extensions/select_optimization.cc      | 16 ++++++++--------
 extensions/select_optimization_test.cc |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/extensions/select_optimization.cc b/extensions/select_optimization.cc
index 44da4c48a..42cad0f92 100644
--- a/extensions/select_optimization.cc
+++ b/extensions/select_optimization.cc
@@ -153,7 +153,7 @@ Expr MakeSelectPathExpr(
 // Returns a single select operation based on the inferred type of the operand
 // and the field name. If the operand type doesn't define the field, returns
 // nullopt.
-absl::optional<SelectInstruction> GetSelectInstruction(
+std::optional<SelectInstruction> GetSelectInstruction(
     const StructType& runtime_type, PlannerContext& planner_context,
     absl::string_view field_name) {
   auto field_or = planner_context.type_reflector()
@@ -407,13 +407,13 @@ class RewriterImpl : public AstRewriterBase {
     // support message traversal.
     const TypeSpec checker_type = ast_.GetTypeOrDyn(operand.id());
 
-    absl::optional<Type> rt_type =
+    std::optional<Type> rt_type =
         (checker_type.has_message_type())
             ? GetRuntimeType(checker_type.message_type().type())
             : absl::nullopt;
     if (rt_type.has_value() && (*rt_type).Is<StructType>()) {
       const StructType& runtime_type = rt_type->GetStruct();
-      absl::optional<SelectInstruction> field_or =
+      std::optional<SelectInstruction> field_or =
           GetSelectInstruction(runtime_type, planner_context_, field_name);
       if (field_or.has_value()) {
         candidates_[&expr] = std::move(field_or).value();
@@ -538,7 +538,7 @@ class RewriterImpl : public AstRewriterBase {
     return candidates_.find(operand) != candidates_.end();
   }
 
-  absl::optional<Type> GetRuntimeType(absl::string_view type_name) {
+  std::optional<Type> GetRuntimeType(absl::string_view type_name) {
     return planner_context_.type_reflector().FindType(type_name).value_or(
         absl::nullopt);
   }
@@ -582,14 +582,14 @@ class OptimizedSelectImpl {
 
   AttributeTrail GetAttributeTrail(const AttributeTrail& operand_trail) const;
 
-  absl::optional<Attribute> attribute() const { return attribute_; }
+  std::optional<Attribute> attribute() const { return attribute_; }
 
   const std::vector<AttributeQualifier>& qualifiers() const {
     return qualifiers_;
   }
 
  private:
-  absl::optional<Attribute> attribute_;
+  std::optional<Attribute> attribute_;
   std::vector<SelectQualifier> select_path_;
   std::vector<AttributeQualifier> qualifiers_;
   bool presence_test_;
@@ -597,7 +597,7 @@ class OptimizedSelectImpl {
 };
 
 // Check for unknowns or missing attributes.
-absl::StatusOr<absl::optional<Value>> CheckForMarkedAttributes(
+absl::StatusOr<std::optional<Value>> CheckForMarkedAttributes(
     ExecutionFrameBase& frame, const AttributeTrail& attribute_trail) {
   if (attribute_trail.empty()) {
     return absl::nullopt;
@@ -715,7 +715,7 @@ absl::Status StackMachineImpl::Evaluate(ExecutionFrame* frame) const {
     // select arguments.
     // TODO(uncreated-issue/51): add support variable qualifiers
     attribute_trail = GetAttributeTrail(frame);
-    CEL_ASSIGN_OR_RETURN(absl::optional<Value> value,
+    CEL_ASSIGN_OR_RETURN(std::optional<Value> value,
                          CheckForMarkedAttributes(*frame, attribute_trail));
     if (value.has_value()) {
       frame->value_stack().Pop(kStackInputs);
diff --git a/extensions/select_optimization_test.cc b/extensions/select_optimization_test.cc
index c07f4c6ad..9d4024098 100644
--- a/extensions/select_optimization_test.cc
+++ b/extensions/select_optimization_test.cc
@@ -254,8 +254,9 @@ class MockAccessApis : public LegacyTypeInfoApis, public LegacyTypeAccessApis {
     return nullptr;
   }
 
-  absl::optional<LegacyTypeInfoApis::FieldDescription> FindFieldByName(
-      absl::string_view field_name) const override {
+  std::optional<
+      google::api::expr::runtime::LegacyTypeInfoApis::FieldDescription>
+  FindFieldByName(absl::string_view field_name) const override {
     return absl::nullopt;
   }