Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,7 +129,6 @@ java_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
Expand All@@ -151,7 +150,6 @@ cel_android_library(
"//:auto_value",
"//common:error_codes",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
Expand DownExpand Up@@ -790,6 +788,7 @@ java_library(
name = "function_overload",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
tags = [
],
Expand All@@ -805,6 +804,7 @@ cel_android_library(
name = "function_overload_android",
srcs = [
"CelFunctionOverload.java",
"OptimizedFunctionOverload.java",
],
deps = [
":evaluation_exception",
Expand DownExpand Up@@ -1306,9 +1306,12 @@ java_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding",
":function_overload",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
],
Expand All@@ -1320,9 +1323,12 @@ cel_android_library(
tags = [
],
deps = [
":evaluation_exception",
":function_binding_android",
":function_overload_android",
"//:auto_value",
"//common/annotations",
"//common/exceptions:overload_not_found",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven_android//:com_google_guava_guava",
],
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,13 +51,13 @@ public interface CelFunctionBinding {
boolean isStrict();

/** Create a unary function binding from the {@code overloadId}, {@code arg}, and {@code impl}. */
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T> CelFunctionBinding from(
String overloadId, Class<T> arg, CelFunctionOverload.Unary<T> impl) {
return from(
overloadId,
ImmutableList.of(arg),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T) args[0]);
Expand All@@ -74,13 +74,13 @@ public Object apply(Object arg1) throws CelEvaluationException {
* Create a binary function binding from the {@code overloadId}, {@code arg1}, {@code arg2}, and
* {@code impl}.
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("unchecked") // Safe from CelFunctionOverload.canHandle check before invocation
static <T1, T2> CelFunctionBinding from(
String overloadId, Class<T1> arg1, Class<T2> arg2, CelFunctionOverload.Binary<T1, T2> impl) {
return from(
overloadId,
ImmutableList.of(arg1, arg2),
new CelFunctionOverload() {
new OptimizedFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
return impl.apply((T1) args[0], (T2) args[1]);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,15 +26,6 @@ public interface CelFunctionOverload {
/** Evaluate a set of arguments throwing a {@code CelException} on error. */
Object apply(Object[] args) throws CelEvaluationException;

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}

/**
* Helper interface for describing unary functions where the type-parameter is used to improve
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ public static CelLateFunctionBindings from(Collection<CelFunctionBinding> functi
private static CelResolvedOverload createResolvedOverload(CelFunctionBinding binding) {
return CelResolvedOverload.of(
binding.getOverloadId(),
(args) -> binding.getDefinition().apply(args),
binding.getDefinition(),
binding.isStrict(),
binding.getArgTypes());
}
Expand Down
38 changes: 37 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelResolvedOverload.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import java.util.List;

/**
Expand DownExpand Up@@ -52,6 +53,33 @@ public abstract class CelResolvedOverload {
/** The function definition. */
public abstract CelFunctionOverload getDefinition();

abstract OptimizedFunctionOverload getOptimizedDefinition();

public Object invoke(Object[] args) throws CelEvaluationException {
// Note: canHandle check is handled separately in DynamicDispatchOverload
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(args, getParameterTypes(), isStrict())) {
return getDefinition().apply(args);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

public Object invoke(Object arg1, Object arg2) throws CelEvaluationException {
if (isDynamicDispatch()
|| CelFunctionOverload.canHandle(arg1, arg2, getParameterTypes(), isStrict())) {
return getOptimizedDefinition().apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(getOverloadId());
}

/**
* Creates a new resolved overload from the given overload id, parameter types, and definition.
*/
Expand All@@ -71,8 +99,12 @@ public static CelResolvedOverload of(
CelFunctionOverload definition,
boolean isStrict,
List<Class<?>> parameterTypes) {
OptimizedFunctionOverload optimizedDef =
(definition instanceof OptimizedFunctionOverload)
? (OptimizedFunctionOverload) definition
: definition::apply;
return new AutoValue_CelResolvedOverload(
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition);
overloadId, ImmutableList.copyOf(parameterTypes), isStrict, definition, optimizedDef);
}

/**
Expand All@@ -81,4 +113,8 @@ public static CelResolvedOverload of(
boolean canHandle(Object[] arguments) {
return CelFunctionOverload.canHandle(arguments, getParameterTypes(), isStrict());
}

private boolean isDynamicDispatch() {
return getDefinition() instanceof FunctionBindingImpl.DynamicDispatchOverload;
}
}
39 changes: 1 addition & 38 deletions runtime/src/main/java/dev/cel/runtime/DefaultDispatcher.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,6 @@
import com.google.errorprone.annotations.Immutable;
import dev.cel.common.CelErrorCode;
import dev.cel.common.annotations.Internal;
import dev.cel.common.exceptions.CelOverloadNotFoundException;
import dev.cel.runtime.FunctionBindingImpl.DynamicDispatchOverload;
import java.util.ArrayList;
import java.util.Collection;
Expand DownExpand Up@@ -202,46 +201,10 @@ public DefaultDispatcher build() {
OverloadEntry overloadEntry = entry.getValue();
CelFunctionOverload overloadImpl = overloadEntry.overload();

CelFunctionOverload guardedApply;
if (overloadImpl instanceof DynamicDispatchOverload) {
// Dynamic dispatcher already does its own internal canHandle checks
guardedApply = overloadImpl;
} else {
boolean isStrict = overloadEntry.isStrict();
ImmutableList<Class<?>> argTypes = overloadEntry.argTypes();

guardedApply =
new CelFunctionOverload() {
@Override
public Object apply(Object[] args) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(args, argTypes, isStrict)) {
return overloadImpl.apply(args);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg, argTypes, isStrict)) {
return overloadImpl.apply(arg);
}
throw new CelOverloadNotFoundException(overloadId);
}

@Override
public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
if (CelFunctionOverload.canHandle(arg1, arg2, argTypes, isStrict)) {
return overloadImpl.apply(arg1, arg2);
}
throw new CelOverloadNotFoundException(overloadId);
}
};
}

resolvedOverloads.put(
overloadId,
CelResolvedOverload.of(
overloadId, guardedApply, overloadEntry.isStrict(), overloadEntry.argTypes()));
overloadId, overloadImpl, overloadEntry.isStrict(), overloadEntry.argTypes()));
}

return new DefaultDispatcher(resolvedOverloads.buildOrThrow());
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ private DynamicDispatchBinding(
}

@Immutable
static final class DynamicDispatchOverload implements CelFunctionOverload {
static final class DynamicDispatchOverload implements OptimizedFunctionOverload {
private final String functionName;
private final ImmutableSet<CelFunctionBinding> overloadBindings;

Expand All@@ -149,7 +149,8 @@ public Object apply(Object[] args) throws CelEvaluationException {
public Object apply(Object arg) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(arg, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg);
}
}
throw new CelOverloadNotFoundException(
Expand All@@ -164,7 +165,8 @@ public Object apply(Object arg1, Object arg2) throws CelEvaluationException {
for (CelFunctionBinding overload : overloadBindings) {
if (CelFunctionOverload.canHandle(
arg1, arg2, overload.getArgTypes(), overload.isStrict())) {
return overload.getDefinition().apply(arg1, arg2);
OptimizedFunctionOverload def = (OptimizedFunctionOverload) overload.getDefinition();
return def.apply(arg1, arg2);
}
}
throw new CelOverloadNotFoundException(
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
// Copyright 2026 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cel.runtime;

import com.google.errorprone.annotations.Immutable;

/**
* Internal interface to support fast-path Unary and Binary evaluations, avoiding Object[]
* allocation.
*/
@Immutable
interface OptimizedFunctionOverload extends CelFunctionOverload {

/** Fast-path for unary function execution to avoid Object[] allocation. */
default Object apply(Object arg) throws CelEvaluationException {
return apply(new Object[] {arg});
}

/** Fast-path for binary function execution to avoid Object[] allocation. */
default Object apply(Object arg1, Object arg2) throws CelEvaluationException {
return apply(new Object[] {arg1, arg2});
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object[] args)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(args);
Object result = overload.invoke(args);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, args);
Expand All@@ -69,7 +69,7 @@ static Object dispatch(
static Object dispatch(CelResolvedOverload overload, CelValueConverter valueConverter, Object arg)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg);
Object result = overload.invoke(arg);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg);
Expand All@@ -80,7 +80,7 @@ static Object dispatch(
CelResolvedOverload overload, CelValueConverter valueConverter, Object arg1, Object arg2)
throws CelEvaluationException {
try {
Object result = overload.getDefinition().apply(arg1, arg2);
Object result = overload.invoke(arg1, arg2);
return valueConverter.maybeUnwrap(valueConverter.toRuntimeValue(result));
} catch (RuntimeException e) {
throw handleDispatchException(e, overload, arg1, arg2);
Expand Down
Loading