Skip to content

Use perfect forwarding in the function adapter instead of wrapping it into two layers of absl::AnyInvocable #1765

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
merged 1 commit into from
Oct 28, 2025
Merged

Use perfect forwarding in the function adapter instead of wrapping it into two layers of absl::AnyInvocable #1765

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
41 changes: 23 additions & 18 deletions runtime/function_adapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <functional>
#include <memory>
#include <tuple>
#include <type_traits>
#include <utility>
#include <vector>

Expand Down Expand Up @@ -200,10 +201,10 @@ class NullaryFunctionAdapter
return std::make_unique<UnaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T() const> function) {
template <typename F, typename = std::enable_if_t<std::is_invocable_v<F>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction(
[function = std::move(function)](
[function = std::forward<F>(function)](
const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
google::protobuf::Arena* absl_nonnull) -> T { return function(); });
Expand Down Expand Up @@ -276,10 +277,10 @@ class UnaryFunctionAdapter : public RegisterHelper<UnaryFunctionAdapter<T, U>> {
return std::make_unique<UnaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T(U) const> function) {
template <typename F, typename = std::enable_if_t<std::is_invocable_v<F, U>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction(
[function = std::move(function)](
[function = std::forward<F>(function)](
U arg1, const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
google::protobuf::Arena* absl_nonnull) -> T { return function(arg1); });
Expand Down Expand Up @@ -406,10 +407,11 @@ class BinaryFunctionAdapter
return std::make_unique<BinaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T(U, V) const> function) {
template <typename F,
typename = std::enable_if_t<std::is_invocable_v<F, U, V>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction(
[function = std::move(function)](
[function = std::forward<F>(function)](
U arg1, V arg2, const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
google::protobuf::Arena* absl_nonnull) -> T { return function(arg1, arg2); });
Expand Down Expand Up @@ -475,9 +477,10 @@ class TernaryFunctionAdapter
return std::make_unique<TernaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T(U, V, W) const> function) {
return WrapFunction([function = std::move(function)](
template <typename F,
typename = std::enable_if_t<std::is_invocable_v<F, U, V, W>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction([function = std::forward<F>(function)](
U arg1, V arg2, W arg3,
const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
Expand Down Expand Up @@ -553,9 +556,10 @@ class QuaternaryFunctionAdapter
return std::make_unique<QuaternaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T(U, V, W, X) const> function) {
return WrapFunction([function = std::move(function)](
template <typename F,
typename = std::enable_if_t<std::is_invocable_v<F, U, V, W, X>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction([function = std::forward<F>(function)](
U arg1, V arg2, W arg3, X arg4,
const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
Expand Down Expand Up @@ -670,10 +674,11 @@ class NaryFunctionAdapter
return std::make_unique<NaryFunctionImpl>(std::move(fn));
}

static std::unique_ptr<cel::Function> WrapFunction(
absl::AnyInvocable<T(Args...) const> function) {
template <typename F,
typename = std::enable_if_t<std::is_invocable_v<F, Args...>>>
static std::unique_ptr<cel::Function> WrapFunction(F&& function) {
return WrapFunction(
[function = std::move(function)](
[function = std::forward<F>(function)](
Args... args, const google::protobuf::DescriptorPool* absl_nonnull,
google::protobuf::MessageFactory* absl_nonnull,
google::protobuf::Arena* absl_nonnull) -> T { return function(args...); });
Expand Down