Skip to content

Remove unnecessary StatusOr wrapping in function step implementation. #2325

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 6, 2026
Merged

Remove unnecessary StatusOr wrapping in function step implementation. #2325

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
39 changes: 28 additions & 11 deletions eval/eval/function_step.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ inline absl::StatusOr<Value> Invoke(
context.set_embedder_context(frame.embedder_context());
}

CEL_ASSIGN_OR_RETURN(Value result,
overload.implementation.Invoke(args, context));
absl::StatusOr<Value> result = overload.implementation.Invoke(args, context);
if (!result.ok()) {
return result;
}

if (frame.unknown_function_results_enabled() &&
IsUnknownFunctionResultError(result)) {
IsUnknownFunctionResultError(*result)) {
return frame.attribute_utility().CreateUnknownSet(overload.descriptor,
expr_id, args);
}
Expand Down Expand Up @@ -402,18 +404,33 @@ void EvaluateFunctionStep(const Step* step, ExecutionFrame& frame) {
}

// Derived class resolves to a single function overload or none.
absl::StatusOr<ResolveResult> matched_function =
step->ResolveFunction(input_args, frame);
if (!matched_function.ok()) {
frame.Abort(std::move(matched_function).status());
return;
// The extra complexity here is to avoid an unnecessary absl::StatusOr
// wrapping ResolveResult for the common case (static resolution).
ResolveResult resolved_function;
if constexpr (std::is_same_v<absl::StatusOr<ResolveResult>,
decltype(step->ResolveFunction(input_args,
frame))>) {
absl::StatusOr<ResolveResult> matched_function =
step->ResolveFunction(input_args, frame);
if (!matched_function.ok()) {
frame.Abort(std::move(matched_function).status());
return;
}
if (matched_function->has_value()) {
resolved_function.emplace(**matched_function);
}
} else {
ResolveResult matched_function = step->ResolveFunction(input_args, frame);
if (matched_function.has_value()) {
resolved_function.emplace(*matched_function);
}
}

// Overload found and is allowed to consume the arguments.
if (matched_function->has_value() &&
ShouldAcceptOverload((*matched_function)->descriptor, input_args)) {
if (resolved_function.has_value() &&
ShouldAcceptOverload(resolved_function->descriptor, input_args)) {
absl::StatusOr<Value> result =
Invoke(**matched_function, step->expr_id_, input_args, frame);
Invoke(*resolved_function, step->expr_id_, input_args, frame);
if (!result.ok()) {
frame.Abort(std::move(result).status());
return;
Expand Down
Loading