Skip to content

Move most comprehension step evaluation into evaluator_core.cc #2420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 29, 2026
Merged

Move most comprehension step evaluation into evaluator_core.cc #2420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eval/compiler/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ cc_library(
"//common:expr",
"//common:kind",
"//common:type",
"//common:type_spec_resolver",
"//common:value",
"//eval/eval:container_access_step",
"//eval/eval:create_map_step",
Expand Down
9 changes: 4 additions & 5 deletions eval/compiler/flat_expr_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
#include "common/expr.h"
#include "common/kind.h"
#include "common/type.h"
#include "common/type_spec_resolver.h"
#include "common/value.h"
#include "eval/compiler/check_ast_extensions.h"
#include "eval/compiler/flat_expr_builder_extensions.h"
Expand Down Expand Up @@ -474,8 +473,8 @@ class ComprehensionVisitor {
absl::Status PostVisitArgDefault(cel::ComprehensionArg arg_num,
const cel::Expr* comprehension_expr);

ComprehensionCondStep* absl_nullable GetCondStep();
ComprehensionNextStep* absl_nullable GetNextStep();
ComprehensionCondStepInfo* absl_nullable GetCondStep();
ComprehensionNextStepInfo* absl_nullable GetNextStep();

FlatExprVisitor* visitor_;
ComprehensionInitStep* init_step_;
Expand Down Expand Up @@ -2095,7 +2094,7 @@ void ComprehensionVisitor::PreVisit(const cel::Expr* expr) {
}
}

ComprehensionCondStep* absl_nullable ComprehensionVisitor::GetCondStep() {
ComprehensionCondStepInfo* absl_nullable ComprehensionVisitor::GetCondStep() {
if (!cond_step_pos_) {
return nullptr;
}
Expand All @@ -2107,7 +2106,7 @@ ComprehensionCondStep* absl_nullable ComprehensionVisitor::GetCondStep() {
return GetIfComprehensionCondStep(*step);
}

ComprehensionNextStep* absl_nullable ComprehensionVisitor::GetNextStep() {
ComprehensionNextStepInfo* absl_nullable ComprehensionVisitor::GetNextStep() {
if (!next_step_pos_) {
return nullptr;
}
Expand Down
282 changes: 0 additions & 282 deletions eval/eval/comprehension_step.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,24 @@
#include "eval/eval/comprehension_step.h"

#include <cstddef>
#include <memory>
#include <utility>

#include "absl/base/attributes.h"
#include "absl/base/casts.h"
#include "absl/base/optimization.h"
#include "absl/log/absl_check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "base/attribute.h"
#include "common/value.h"
#include "common/value_kind.h"
#include "eval/eval/attribute_trail.h"
#include "eval/eval/comprehension_slots.h"
#include "eval/eval/evaluator_core.h"
#include "eval/eval/iterator_stack.h"
#include "eval/internal/errors.h"

namespace google::api::expr::runtime {
namespace {

enum class IterableKind {
kList = 1,
kMap,
};

using ::cel::AttributeQualifier;
using ::cel::Value;
using ::cel::ValueIteratorPtr;
using ::cel::ValueKind;
using ::cel::runtime_internal::CreateNoMatchingOverloadError;
using ::cel::runtime_internal::IteratorStack;

AttributeQualifier AttributeQualifierFromValue(const Value& v) {
switch (v.kind()) {
case ValueKind::kString:
return AttributeQualifier::OfString(v.GetString().ToString());
case ValueKind::kInt64:
return AttributeQualifier::OfInt(v.GetInt().NativeValue());
case ValueKind::kUint64:
return AttributeQualifier::OfUint(v.GetUint().NativeValue());
case ValueKind::kBool:
return AttributeQualifier::OfBool(v.GetBool().NativeValue());
default:
// Non-matching qualifier.
return AttributeQualifier();
}
}

} // namespace

Expand Down Expand Up @@ -103,256 +73,4 @@ void ComprehensionInitStep::Evaluate(ExecutionFrame* frame) const {
}
}

void ComprehensionNextStep::Evaluate1(ExecutionFrame* frame) const {
if (frame->iterator_stack().empty()) {
frame->Abort(absl::InternalError("Iterator stack underflow"));
return;
}
const IteratorStack::Entry& entry = *frame->iterator_stack().Peek();
if (!frame->value_stack().HasEnough(2)) {
frame->Abort(
absl::Status(absl::StatusCode::kInternal, "Value stack underflow"));
return;
}

{
Value& accu_var = frame->value_stack().Peek();
AttributeTrail& accu_var_attr = frame->value_stack().PeekAttribute();
frame->comprehension_slots().Set(entry.accu_slot, std::move(accu_var),
std::move(accu_var_attr));
frame->value_stack().Pop(1);
}

ComprehensionSlots::Slot* iter_slot =
frame->comprehension_slots().Get(entry.iter_slot);
ABSL_DCHECK(iter_slot != nullptr);
iter_slot->Set();

if (frame->enable_unknowns()) {
Value key_or_value;
Value* key;
Value* value;
switch (frame->value_stack().Peek().kind()) {
case ValueKind::kList:
key = &key_or_value;
value = iter_slot->mutable_value();
break;
case ValueKind::kMap:
key = iter_slot->mutable_value();
value = nullptr;
break;
default:
ABSL_UNREACHABLE();
}
absl::StatusOr<bool> ok = entry.iterator->Next2(frame->descriptor_pool(),
frame->message_factory(),
frame->arena(), key, value);
if (!ok.ok()) {
frame->Abort(std::move(ok).status());
return;
}
if (!*ok) {
iter_slot->Clear();
frame->JumpToOrAbort(jump_offset_);
return;
}
absl::Status inc_status = frame->IncrementIterations();
if (!inc_status.ok()) {
frame->Abort(std::move(inc_status));
return;
}
cel::AttributeQualifier qualifier = AttributeQualifierFromValue(*key);
if (qualifier) {
static_cast<void>(
frame->value_stack().PeekAttribute().Match<AttributeTrail::kFull>(
qualifier, *iter_slot->mutable_value(),
*iter_slot->mutable_attribute(), frame->unknown_tree()));
}
} else {
absl::StatusOr<bool> ok = entry.iterator->Next1(
frame->descriptor_pool(), frame->message_factory(), frame->arena(),
iter_slot->mutable_value());
if (!ok.ok()) {
frame->Abort(std::move(ok).status());
return;
}
if (!*ok) {
iter_slot->Clear();
frame->JumpToOrAbort(jump_offset_);
return;
}
absl::Status inc_status = frame->IncrementIterations();
if (!inc_status.ok()) {
frame->Abort(std::move(inc_status));
return;
}
}
}

void ComprehensionNextStep::Evaluate2(ExecutionFrame* frame) const {
if (frame->iterator_stack().empty()) {
frame->Abort(absl::InternalError("Iterator stack underflow"));
return;
}
const IteratorStack::Entry& entry = *frame->iterator_stack().Peek();
if (!frame->value_stack().HasEnough(2)) {
frame->Abort(
absl::Status(absl::StatusCode::kInternal, "Value stack underflow"));
return;
}

{
Value& accu_var = frame->value_stack().Peek();
AttributeTrail& accu_var_attr = frame->value_stack().PeekAttribute();
frame->comprehension_slots().Set(entry.accu_slot, std::move(accu_var),
std::move(accu_var_attr));
frame->value_stack().Pop(1);
}

ComprehensionSlots::Slot* iter_slot =
frame->comprehension_slots().Get(entry.iter_slot);
ABSL_DCHECK(iter_slot != nullptr);
iter_slot->Set();

ComprehensionSlots::Slot* iter2_slot =
frame->comprehension_slots().Get(entry.iter2_slot);
ABSL_DCHECK(iter2_slot != nullptr);
iter2_slot->Set();

absl::StatusOr<bool> ok = entry.iterator->Next2(
frame->descriptor_pool(), frame->message_factory(), frame->arena(),
iter_slot->mutable_value(), iter2_slot->mutable_value());
if (!ok.ok()) {
frame->Abort(std::move(ok).status());
return;
}
if (!*ok) {
iter_slot->Clear();
iter2_slot->Clear();
frame->JumpToOrAbort(jump_offset_);
return;
}
absl::Status inc_status = frame->IncrementIterations();
if (!inc_status.ok()) {
frame->Abort(std::move(inc_status));
return;
}
if (frame->enable_unknowns()) {
cel::AttributeQualifier qualifier =
AttributeQualifierFromValue(iter_slot->value());
if (qualifier) {
static_cast<void>(
frame->value_stack().PeekAttribute().Match<AttributeTrail::kFull>(
qualifier, *iter2_slot->mutable_value(),
*iter_slot->mutable_attribute(), frame->unknown_tree()));
*iter2_slot->mutable_attribute() = iter_slot->attribute();
}
}
}

void ComprehensionCondStep::Evaluate1(ExecutionFrame* frame) const {
if (frame->iterator_stack().empty()) {
frame->Abort(absl::InternalError("Iterator stack underflow"));
return;
}
const IteratorStack::Entry& entry = *frame->iterator_stack().Peek();
if (!frame->value_stack().HasEnough(2)) {
frame->Abort(
absl::Status(absl::StatusCode::kInternal, "Value stack underflow"));
return;
}
const Value& top = frame->value_stack().Peek();
switch (top.kind()) {
case ValueKind::kBool:
break;
case ValueKind::kError:
ABSL_FALLTHROUGH_INTENDED;
case ValueKind::kUnknown: {
frame->value_stack().SwapAndPop(2, 1);
frame->comprehension_slots().ClearSlot(entry.iter_slot);
frame->comprehension_slots().ClearSlot(entry.accu_slot);
frame->iterator_stack().Pop();
frame->JumpToOrAbort(error_jump_offset_);
return;
}
default: {
frame->value_stack().PopAndPush(
2, cel::ErrorValue::From(
CreateNoMatchingOverloadError("<loop_condition>"),
frame->arena()));
frame->comprehension_slots().ClearSlot(entry.iter_slot);
frame->comprehension_slots().ClearSlot(entry.accu_slot);
frame->iterator_stack().Pop();
frame->JumpToOrAbort(error_jump_offset_);
return;
}
}
const bool loop_condition = absl::implicit_cast<bool>(top.GetBool());
const bool short_circuiting = frame->options().short_circuiting;
frame->value_stack().Pop(1); // loop_condition
if (!loop_condition && short_circuiting) {
frame->JumpToOrAbort(jump_offset_);
return;
}
}

void ComprehensionCondStep::Evaluate2(ExecutionFrame* frame) const {
if (frame->iterator_stack().empty()) {
frame->Abort(absl::InternalError("Iterator stack underflow"));
return;
}
const IteratorStack::Entry& entry = *frame->iterator_stack().Peek();
if (!frame->value_stack().HasEnough(2)) {
frame->Abort(
absl::Status(absl::StatusCode::kInternal, "Value stack underflow"));
return;
}
const Value& top = frame->value_stack().Peek();
switch (top.kind()) {
case ValueKind::kBool:
break;
case ValueKind::kError:
ABSL_FALLTHROUGH_INTENDED;
case ValueKind::kUnknown: {
frame->value_stack().SwapAndPop(2, 1);
frame->comprehension_slots().ClearSlot(entry.iter_slot);
frame->comprehension_slots().ClearSlot(entry.iter2_slot);
frame->comprehension_slots().ClearSlot(entry.accu_slot);
frame->iterator_stack().Pop();
frame->JumpToOrAbort(error_jump_offset_);
return;
}
default: {
frame->value_stack().PopAndPush(
2, cel::ErrorValue::From(
CreateNoMatchingOverloadError("<loop_condition>"),
frame->arena()));
frame->comprehension_slots().ClearSlot(entry.iter_slot);
frame->comprehension_slots().ClearSlot(entry.iter2_slot);
frame->comprehension_slots().ClearSlot(entry.accu_slot);
frame->iterator_stack().Pop();
frame->JumpToOrAbort(error_jump_offset_);
return;
}
}
const bool loop_condition = absl::implicit_cast<bool>(top.GetBool());
const bool short_circuiting = frame->options().short_circuiting;
frame->value_stack().Pop(1); // loop_condition
if (!loop_condition && short_circuiting) {
frame->JumpToOrAbort(jump_offset_);
return;
}
}

void EvaluateComprehensionFinishStep(size_t accu_slot, ExecutionFrame& frame) {
if (!frame.value_stack().HasEnough(2)) {
frame.Abort(
absl::Status(absl::StatusCode::kInternal, "Value stack underflow"));
return;
}
frame.value_stack().SwapAndPop(2, 1);
frame.comprehension_slots().ClearSlot(accu_slot);
frame.iterator_stack().Pop();
}

} // namespace google::api::expr::runtime
Loading
Loading