Persist lazily bound variables in the correct scoped resolver#881

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Dec 5, 2025
Merged

Persist lazily bound variables in the correct scoped resolver #881

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
assertThat(result).isTrue();
assertThat(invocation.get()).isEqualTo(2);
}

@Test
@SuppressWarnings({"Immutable", "unchecked"}) // Test only
public void lazyBinding_boundAttributeInComprehension() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.MAP)
.addLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
"get_true",
CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
.build();
AtomicInteger invocation = new AtomicInteger();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addFunctionBindings(
CelFunctionBinding.from(
"get_true_overload",
ImmutableList.of(),
arg -> {
invocation.getAndIncrement();
return true;
}))
.build();

CelAbstractSyntaxTree ast =
celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

assertThat(result).containsExactly(true, true, true);
assertThat(invocation.get()).isEqualTo(1);
}

@Test
@SuppressWarnings({"Immutable"}) // Test only
public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
CelCompiler celCompiler =
CelCompilerFactory.standardCelCompilerBuilder()
.setStandardMacros(CelStandardMacro.EXISTS)
.addLibraries(CelExtensions.bindings())
.addFunctionDeclarations(
CelFunctionDecl.newFunctionDeclaration(
"get_true",
CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
.build();
AtomicInteger invocation = new AtomicInteger();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addFunctionBindings(
CelFunctionBinding.from(
"get_true_overload",
ImmutableList.of(),
arg -> {
invocation.getAndIncrement();
return true;
}))
.build();

CelAbstractSyntaxTree ast =
celCompiler
.compile(
"cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
+ "['a','b','c'].exists(unused_2, x)))")
.getAst();

boolean result = (boolean) celRuntime.createProgram(ast).eval();

assertThat(result).isTrue();
assertThat(invocation.get()).isEqualTo(1);
}
}
118 changes: 113 additions & 5 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
* Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
private static final SubexpressionOptimizer INSTANCE =
new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
private static final String BIND_IDENTIFIER_PREFIX = "@r";
private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
private static final String CEL_BLOCK_FUNCTION = "cel.@block";
private static final String BLOCK_INDEX_PREFIX = "@index";
private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

@VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
@VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
@VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

private final SubexpressionOptimizerOptions cseOptions;
private final AstMutator astMutator;
private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
Verify.verify(
resultHasAtLeastOneBlockIndex,
"Expected at least one reference of index in cel.block result");

verifyNoInvalidScopedMangledVariables(celBlockExpr);
}

private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
celExpr);
}

private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
CelCall celBlockCall = celExpr.call();
CelExpr blockBody = celBlockCall.args().get(1);

ImmutableSet<String> allMangledVariablesInBlockBody =
CelNavigableExpr.fromExpr(blockBody)
.allNodes()
.map(CelNavigableExpr::expr)
.flatMap(SubexpressionOptimizer::extractMangledNames)
.collect(toImmutableSet());

CelList blockIndices = celBlockCall.args().get(0).list();
for (CelExpr blockIndex : blockIndices.elements()) {
ImmutableSet<String> indexDeclaredCompVariables =
CelNavigableExpr.fromExpr(blockIndex)
.allNodes()
.map(CelNavigableExpr::expr)
.filter(expr -> expr.getKind() == Kind.COMPREHENSION)
.map(CelExpr::comprehension)
.flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
.filter(iter -> !Strings.isNullOrEmpty(iter))
.collect(toImmutableSet());

boolean containsIllegalDeclaration =
CelNavigableExpr.fromExpr(blockIndex)
.allNodes()
.map(CelNavigableExpr::expr)
.filter(expr -> expr.getKind() == Kind.IDENT)
.map(expr -> expr.ident().name())
.filter(SubexpressionOptimizer::isMangled)
.anyMatch(
ident ->
!indexDeclaredCompVariables.contains(ident)
&& allMangledVariablesInBlockBody.contains(ident));

Verify.verify(
!containsIllegalDeclaration,
"Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
celExpr);
}
}

private static Stream<String> extractMangledNames(CelExpr expr) {
if (expr.getKind().equals(Kind.IDENT)) {
String name = expr.ident().name();
return isMangled(name) ? Stream.of(name) : Stream.empty();
}
if (expr.getKind().equals(Kind.COMPREHENSION)) {
CelComprehension comp = expr.comprehension();
return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
.filter(x -> !Strings.isNullOrEmpty(x))
.filter(SubexpressionOptimizer::isMangled);
}
return Stream.empty();
}

private static boolean isMangled(String name) {
return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
}

private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
// Tag the extension
CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
navAst
.getRoot()
.descendants(TraversalOrder.PRE_ORDER)
.filter(node -> canEliminate(node, ineligibleExprs))
.filter(node -> node.height() <= recursionLimit)
.filter(node -> canEliminate(node, ineligibleExprs))
.sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
.collect(toImmutableList());
if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
&& navigableExpr.expr().list().elements().isEmpty())
&& containsEliminableFunctionOnly(navigableExpr)
&& !ineligibleExprs.contains(navigableExpr.expr())
&& containsComprehensionIdentInSubexpr(navigableExpr);
&& containsComprehensionIdentInSubexpr(navigableExpr)
&& containsProperScopedComprehensionIdents(navigableExpr);
}

private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
return true;
}

// For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
// comprehension [2].exists(y, x == y)
// should not be extracted out into a block index, as it causes issues with scoping.
ImmutableSet<String> mangledIterVars =
navExpr
.descendants()
.filter(x -> x.getKind().equals(Kind.IDENT))
.map(x -> x.expr().ident().name())
.filter(
name ->
name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
|| name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
.collect(toImmutableSet());

CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
while (parent != null) {
if (parent.getKind().equals(Kind.COMPREHENSION)) {
CelMutableComprehension comp = parent.expr().comprehension();
boolean containsParentIterReferences =
mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

if (containsParentIterReferences) {
return false;
}
}

parent = parent.parent().orElse(null);
}

return true;
}

private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down
32 changes: 29 additions & 3 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
assertThat(invocation.get()).isEqualTo(1);
}

@Test
@SuppressWarnings({"Immutable", "unchecked"}) // Test only
public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
AtomicInteger invocation = new AtomicInteger();
CelRuntime celRuntime =
CelRuntimeFactory.standardCelRuntimeBuilder()
.addMessageTypes(TestAllTypes.getDescriptor())
.addFunctionBindings(
CelFunctionBinding.from(
"get_true_overload",
ImmutableList.of(),
arg -> {
invocation.getAndIncrement();
return true;
}))
.build();
CelAbstractSyntaxTree ast =
compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

assertThat(result).containsExactly(true, true, true);
assertThat(invocation.get()).isEqualTo(1);
}

@Test
@SuppressWarnings("Immutable") // Test only
public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
// Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
CelAbstractSyntaxTree ast =
compileUsingInternalFunctions(
"cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
+ " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
+ " true, true]]]");
"cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
+ " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
+ " true]]]");

boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

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
Persist lazily bound variables in the correct scoped resolver#881

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

copybara-service
merged 1 commit into

from

Dec 5, 2025
 Merged


Persist lazily bound variables in the correct scoped resolver
#881
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


73 changes: 73 additions & 0 deletions
extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -243,4 +244,76 @@ public void lazyBinding_withNestedBinds() throws Exception {
 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(2);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyBinding_boundAttributeInComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.MAP)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler.compile("cel.bind(x, get_true(), [1,2,3].map(y, y < 0 || x))").getAst();

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable"}) // Test only
 public void lazyBinding_boundAttributeInNestedComprehension() throws Exception {
 CelCompiler celCompiler =
 CelCompilerFactory.standardCelCompilerBuilder()
 .setStandardMacros(CelStandardMacro.EXISTS)
 .addLibraries(CelExtensions.bindings())
 .addFunctionDeclarations(
 CelFunctionDecl.newFunctionDeclaration(
 "get_true",
 CelOverloadDecl.newGlobalOverload("get_true_overload", SimpleType.BOOL)))
 .build();
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();

 CelAbstractSyntaxTree ast =
 celCompiler
 .compile(
 "cel.bind(x, get_true(), [1,2,3].exists(unused, x && "
 + "['a','b','c'].exists(unused_2, x)))")
 .getAst();

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

 assertThat(result).isTrue();
 assertThat(invocation.get()).isEqualTo(1);
 }
}

118 changes: 113 additions & 5 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/SubexpressionOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,11 +16,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.stream.Collectors.toCollection;

import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Verify;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
Expand All@@ -41,8 +43,11 @@
import dev.cel.common.CelVarDecl;
import dev.cel.common.ast.CelExpr;
import dev.cel.common.ast.CelExpr.CelCall;
import dev.cel.common.ast.CelExpr.CelComprehension;
import dev.cel.common.ast.CelExpr.CelList;
import dev.cel.common.ast.CelExpr.ExprKind.Kind;
import dev.cel.common.ast.CelMutableExpr;
import dev.cel.common.ast.CelMutableExpr.CelMutableComprehension;
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableExpr;
import dev.cel.common.navigation.CelNavigableMutableAst;
Expand All@@ -60,6 +65,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Stream;

/**
 * Performs Common Subexpression Elimination.
Expand DownExpand Up@@ -90,14 +96,15 @@ public class SubexpressionOptimizer implements CelAstOptimizer {
 private static final SubexpressionOptimizer INSTANCE =
 new SubexpressionOptimizer(SubexpressionOptimizerOptions.newBuilder().build());
 private static final String BIND_IDENTIFIER_PREFIX = "@r";
 private static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 private static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 private static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";
 private static final String CEL_BLOCK_FUNCTION = "cel.@block";
 private static final String BLOCK_INDEX_PREFIX = "@index";
 private static final Extension CEL_BLOCK_AST_EXTENSION_TAG =
 Extension.create("cel_block", Version.of(1L, 1L), Component.COMPONENT_RUNTIME);

 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR_PREFIX = "@it";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ITER_VAR2_PREFIX = "@it2";
 @VisibleForTesting static final String MANGLED_COMPREHENSION_ACCU_VAR_PREFIX = "@ac";

 private final SubexpressionOptimizerOptions cseOptions;
 private final AstMutator astMutator;
 private final ImmutableSet<String> cseEliminableFunctions;
Expand DownExpand Up@@ -269,6 +276,8 @@ static void verifyOptimizedAstCorrectness(CelAbstractSyntaxTree ast) {
 Verify.verify(
 resultHasAtLeastOneBlockIndex,
 "Expected at least one reference of index in cel.block result");

 verifyNoInvalidScopedMangledVariables(celBlockExpr);
 }

 private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
Expand All@@ -289,6 +298,67 @@ private static void verifyBlockIndex(CelExpr celExpr, int maxIndexValue) {
 celExpr);
 }

 private static void verifyNoInvalidScopedMangledVariables(CelExpr celExpr) {
 CelCall celBlockCall = celExpr.call();
 CelExpr blockBody = celBlockCall.args().get(1);

 ImmutableSet<String> allMangledVariablesInBlockBody =
 CelNavigableExpr.fromExpr(blockBody)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .flatMap(SubexpressionOptimizer::extractMangledNames)
 .collect(toImmutableSet());

 CelList blockIndices = celBlockCall.args().get(0).list();
 for (CelExpr blockIndex : blockIndices.elements()) {
 ImmutableSet<String> indexDeclaredCompVariables =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.COMPREHENSION)
 .map(CelExpr::comprehension)
 .flatMap(comp -> Stream.of(comp.iterVar(), comp.iterVar2()))
 .filter(iter -> !Strings.isNullOrEmpty(iter))
 .collect(toImmutableSet());

 boolean containsIllegalDeclaration =
 CelNavigableExpr.fromExpr(blockIndex)
 .allNodes()
 .map(CelNavigableExpr::expr)
 .filter(expr -> expr.getKind() == Kind.IDENT)
 .map(expr -> expr.ident().name())
 .filter(SubexpressionOptimizer::isMangled)
 .anyMatch(
 ident ->
 !indexDeclaredCompVariables.contains(ident)
 && allMangledVariablesInBlockBody.contains(ident));

 Verify.verify(
 !containsIllegalDeclaration,
 "Illegal declared reference to a comprehension variable found in block indices. Expr: %s",
 celExpr);
 }
 }

 private static Stream<String> extractMangledNames(CelExpr expr) {
 if (expr.getKind().equals(Kind.IDENT)) {
 String name = expr.ident().name();
 return isMangled(name) ? Stream.of(name) : Stream.empty();
 }
 if (expr.getKind().equals(Kind.COMPREHENSION)) {
 CelComprehension comp = expr.comprehension();
 return Stream.of(comp.iterVar(), comp.iterVar2(), comp.accuVar())
 .filter(x -> !Strings.isNullOrEmpty(x))
 .filter(SubexpressionOptimizer::isMangled);
 }
 return Stream.empty();
 }

 private static boolean isMangled(String name) {
 return name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX);
 }

 private static CelAbstractSyntaxTree tagAstExtension(CelAbstractSyntaxTree ast) {
 // Tag the extension
 CelSource.Builder celSourceBuilder =
Expand DownExpand Up@@ -355,8 +425,8 @@ private List<CelMutableExpr> getCseCandidatesWithRecursionDepth(
 navAst
 .getRoot()
 .descendants(TraversalOrder.PRE_ORDER)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .filter(node -> node.height() <= recursionLimit)
 .filter(node -> canEliminate(node, ineligibleExprs))
 .sorted(Comparator.comparingInt(CelNavigableMutableExpr::height).reversed())
 .collect(toImmutableList());
 if (descendants.isEmpty()) {
Expand DownExpand Up@@ -441,7 +511,45 @@ private boolean canEliminate(
 && navigableExpr.expr().list().elements().isEmpty())
 && containsEliminableFunctionOnly(navigableExpr)
 && !ineligibleExprs.contains(navigableExpr.expr())
 && containsComprehensionIdentInSubexpr(navigableExpr);
 && containsComprehensionIdentInSubexpr(navigableExpr)
 && containsProperScopedComprehensionIdents(navigableExpr);
 }

 private boolean containsProperScopedComprehensionIdents(CelNavigableMutableExpr navExpr) {
 if (!navExpr.getKind().equals(Kind.COMPREHENSION)) {
 return true;
 }

 // For nested comprehensions of form [1].exists(x, [2].exists(y, x == y)), the inner
 // comprehension [2].exists(y, x == y)
 // should not be extracted out into a block index, as it causes issues with scoping.
 ImmutableSet<String> mangledIterVars =
 navExpr
 .descendants()
 .filter(x -> x.getKind().equals(Kind.IDENT))
 .map(x -> x.expr().ident().name())
 .filter(
 name ->
 name.startsWith(MANGLED_COMPREHENSION_ITER_VAR_PREFIX)
 || name.startsWith(MANGLED_COMPREHENSION_ITER_VAR2_PREFIX))
 .collect(toImmutableSet());

 CelNavigableMutableExpr parent = navExpr.parent().orElse(null);
 while (parent != null) {
 if (parent.getKind().equals(Kind.COMPREHENSION)) {
 CelMutableComprehension comp = parent.expr().comprehension();
 boolean containsParentIterReferences =
 mangledIterVars.contains(comp.iterVar()) || mangledIterVars.contains(comp.iterVar2());

 if (containsParentIterReferences) {
 return false;
 }
 }

 parent = parent.parent().orElse(null);
 }

 return true;
 }

 private boolean containsComprehensionIdentInSubexpr(CelNavigableMutableExpr navExpr) {
Expand Down

32 changes: 29 additions & 3 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/SubexpressionOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@
import dev.cel.runtime.CelFunctionBinding;
import dev.cel.runtime.CelRuntime;
import dev.cel.runtime.CelRuntimeFactory;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand DownExpand Up@@ -381,6 +382,31 @@ public void lazyEval_blockIndexEvaluatedOnlyOnce() throws Exception {
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings({"Immutable", "unchecked"}) // Test only
 public void lazyEval_withinComprehension_blockIndexEvaluatedOnlyOnce() throws Exception {
 AtomicInteger invocation = new AtomicInteger();
 CelRuntime celRuntime =
 CelRuntimeFactory.standardCelRuntimeBuilder()
 .addMessageTypes(TestAllTypes.getDescriptor())
 .addFunctionBindings(
 CelFunctionBinding.from(
 "get_true_overload",
 ImmutableList.of(),
 arg -> {
 invocation.getAndIncrement();
 return true;
 }))
 .build();
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions("cel.block([get_true()], [1,2,3].map(x, x < 0 || index0))");

 List<Boolean> result = (List<Boolean>) celRuntime.createProgram(ast).eval();

 assertThat(result).containsExactly(true, true, true);
 assertThat(invocation.get()).isEqualTo(1);
 }

 @Test
 @SuppressWarnings("Immutable") // Test only
 public void lazyEval_multipleBlockIndices_inResultExpr() throws Exception {
Expand DownExpand Up@@ -452,9 +478,9 @@ public void lazyEval_nestedComprehension_indexReferencedInNestedScopes() throws
 // Equivalent of [true, false, true].map(c0, [c0].map(c1, [c0, c1, true]))
 CelAbstractSyntaxTree ast =
 compileUsingInternalFunctions(
 "cel.block([c0, c1, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [index0,"
 + " index1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true,"
 + " true, true]]]");
 "cel.block([true, false, get_true()], [index2, false, index2].map(c0, [c0].map(c1, [c0,"
 + " c1, index2]))) == [[[true, true, true]], [[false, false, true]], [[true, true,"
 + " true]]]");

 boolean result = (boolean) celRuntime.createProgram(ast).eval();

Expand Down
Loading