Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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
Aug 3, 2026
Merged

Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables #1162

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
78 changes: 69 additions & 9 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

CelMutableExpr needle = call.args().get(0);
if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
Object needleValue =
needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
for (CelMutableExpr elem : haystack.elements()) {
if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
|| (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
return Optional.of(
astMutator.replaceSubtree(
mutableAst.expr(),
CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
expr.id()));
if ((elem.getKind().equals(Kind.CONSTANT)
&& needle.getKind().equals(Kind.CONSTANT)
&& elem.constant().equals(needle.constant()))
|| (elem.getKind().equals(Kind.IDENT)
&& needle.getKind().equals(Kind.IDENT)
&& elem.ident().equals(needle.ident()))) {
if (needle.getKind().equals(Kind.CONSTANT)) {
if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
&& Double.isNaN(needle.constant().doubleValue())) {
continue;
}
return Optional.of(
astMutator.replaceSubtree(
mutableAst.expr(),
CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
expr.id()));
}

CelType needleType =
mutableAst
.getType(needle.id())
.orElseGet(() -> identTypes.get(needle.ident().name()));

if (needleType != null && isSafeForExactEquality(needleType)) {
return Optional.of(
astMutator.replaceSubtree(
mutableAst.expr(),
CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
expr.id()));
}
}
}
}
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
}

private static boolean isSafeForExactEquality(CelType celType) {
switch (celType.kind()) {
case BOOL:
case INT:
case UINT:
case STRING:
case BYTES:
case DURATION:
case TIMESTAMP:
case NULL_TYPE:
case TYPE:
return true;

case LIST:
return !celType.parameters().isEmpty()
&& isSafeForExactEquality(celType.parameters().get(0));

case MAP:
return celType.parameters().size() >= 2
&& isSafeForExactEquality(celType.parameters().get(0))
&& isSafeForExactEquality(celType.parameters().get(1));

case OPAQUE:
if (celType instanceof OptionalType) {
checkState(
celType.parameters().size() == 1,
"Optional type must have exactly 1 parameter. Found %s",
celType.parameters().size());
return isSafeForExactEquality(celType.parameters().get(0));
}
return false;

default:
return false;
}
}

private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
this.constantFoldingOptions = constantFoldingOptions;
this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down
86 changes: 84 additions & 2 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
return celBuilder
.addVar("x", SimpleType.DYN)
.addVar("y", SimpleType.DYN)
.addVar("dyn_x", SimpleType.DYN)
.addVar("int_x", SimpleType.INT)
.addVar("double_x", SimpleType.DOUBLE)
.addVar("bool_x", SimpleType.BOOL)
.addVar("string_x", SimpleType.STRING)
.addVar("int_list_x", ListType.create(SimpleType.INT))
.addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
.addVar("dyn_list_x", ListType.create(SimpleType.DYN))
.addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
.addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
.addVar("optional_int_x", OptionalType.create(SimpleType.INT))
.addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
.addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
.addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
.addVar(
"nested_map_list_int_x",
MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
.addVar(
"nested_map_list_double_x",
MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
.addVar("nullable_int_x", NullableType.create(SimpleType.INT))
.addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
.addVar("bool_var", SimpleType.BOOL)
.addVar("list_var", ListType.create(SimpleType.STRING))
.addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
@TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
@TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
@TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
@TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
@TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
@TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
@TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
@TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
@TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
@TestParameters(
"{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
@TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
@TestParameters(
"{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
+ " double_list_x]'}")
@TestParameters(
"{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
@TestParameters(
"{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
@TestParameters(
"{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
+ " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
@TestParameters(
"{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
@TestParameters(
"{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
+ " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
@TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
@TestParameters(
"{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
+ " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
@TestParameters(
"{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
+ " [NaN, double_x]'}")
@TestParameters(
"{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
@TestParameters(
"{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
+ " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
@TestParameters(
"{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
+ " 'true'}")
@TestParameters(
"{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
+ " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
+ " nested_map_list_double_x]'}")
@TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
@TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
@TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
@TestParameters(
"{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
+ "expected: 'optional.of(\"barbaz\")'}")
@TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
@TestParameters(
"{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
throws Exception {
Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
}

@Test
public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
Cel celWithoutMacros =
setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
.addAstOptimizers(ConstantFoldingOptimizer.getInstance())
.build();
CelAbstractSyntaxTree ast =
celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
}
}
4 changes: 3 additions & 1 deletion verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

private final String exprA;
private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
OPTIONAL_SELECTION_VS_DIRECT_ERROR(
"{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
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
Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables#1162

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

Aug 3, 2026
 Merged


Prevent ConstantFoldingOptimizer to fold x in [x] for dyn/double typed variables
#1162
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


78 changes: 69 additions & 9 deletions
optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@
package dev.cel.optimizer.optimizers;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.MoreCollectors.onlyElement;
import static dev.cel.checker.CelStandardDeclarations.StandardFunction.DURATION;
Expand DownExpand Up@@ -46,6 +47,7 @@
import dev.cel.common.navigation.TraversalOrder;
import dev.cel.common.types.CelType;
import dev.cel.common.types.CelTypeProvider;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructType;
import dev.cel.common.values.CelValue;
Expand DownExpand Up@@ -541,16 +543,37 @@ private Optional<CelMutableAst> maybePruneBranches(

 CelMutableExpr needle = call.args().get(0);
 if (needle.getKind().equals(Kind.CONSTANT) || needle.getKind().equals(Kind.IDENT)) {
 Object needleValue =
 needle.getKind().equals(Kind.CONSTANT) ? needle.constant() : needle.ident();
 for (CelMutableExpr elem : haystack.elements()) {
 if ((elem.getKind().equals(Kind.CONSTANT) && elem.constant().equals(needleValue))
 || (elem.getKind().equals(Kind.IDENT) && elem.ident().equals(needleValue))) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 if ((elem.getKind().equals(Kind.CONSTANT)
 && needle.getKind().equals(Kind.CONSTANT)
 && elem.constant().equals(needle.constant()))
 || (elem.getKind().equals(Kind.IDENT)
 && needle.getKind().equals(Kind.IDENT)
 && elem.ident().equals(needle.ident()))) {
 if (needle.getKind().equals(Kind.CONSTANT)) {
 if (needle.constant().getKind().equals(CelConstant.Kind.DOUBLE_VALUE)
 && Double.isNaN(needle.constant().doubleValue())) {
 continue;
 }
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }

 CelType needleType =
 mutableAst
 .getType(needle.id())
 .orElseGet(() -> identTypes.get(needle.ident().name()));

 if (needleType != null && isSafeForExactEquality(needleType)) {
 return Optional.of(
 astMutator.replaceSubtree(
 mutableAst.expr(),
 CelMutableExpr.ofConstant(CelConstant.ofValue(true)),
 expr.id()));
 }
 }
 }
 }
Expand DownExpand Up@@ -948,6 +971,43 @@ private static boolean isExprConstantOfKind(CelMutableExpr expr, CelConstant.Kin
 return expr.getKind().equals(Kind.CONSTANT) && expr.constant().getKind().equals(constantKind);
 }

 private static boolean isSafeForExactEquality(CelType celType) {
 switch (celType.kind()) {
 case BOOL:
 case INT:
 case UINT:
 case STRING:
 case BYTES:
 case DURATION:
 case TIMESTAMP:
 case NULL_TYPE:
 case TYPE:
 return true;

 case LIST:
 return !celType.parameters().isEmpty()
 && isSafeForExactEquality(celType.parameters().get(0));

 case MAP:
 return celType.parameters().size() >= 2
 && isSafeForExactEquality(celType.parameters().get(0))
 && isSafeForExactEquality(celType.parameters().get(1));

 case OPAQUE:
 if (celType instanceof OptionalType) {
 checkState(
 celType.parameters().size() == 1,
 "Optional type must have exactly 1 parameter. Found %s",
 celType.parameters().size());
 return isSafeForExactEquality(celType.parameters().get(0));
 }
 return false;

 default:
 return false;
 }
 }

 private ConstantFoldingOptimizer(ConstantFoldingOptions constantFoldingOptions) {
 this.constantFoldingOptions = constantFoldingOptions;
 this.astMutator = AstMutator.newInstance(constantFoldingOptions.maxIterationLimit());
Expand Down

86 changes: 84 additions & 2 deletions
optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@
import dev.cel.common.CelOverloadDecl;
import dev.cel.common.types.ListType;
import dev.cel.common.types.MapType;
import dev.cel.common.types.NullableType;
import dev.cel.common.types.OptionalType;
import dev.cel.common.types.SimpleType;
import dev.cel.common.types.StructTypeReference;
import dev.cel.expr.conformance.proto2.TestAllTypes.NestedMessage;
Expand DownExpand Up@@ -80,6 +82,28 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 return celBuilder
 .addVar("x", SimpleType.DYN)
 .addVar("y", SimpleType.DYN)
 .addVar("dyn_x", SimpleType.DYN)
 .addVar("int_x", SimpleType.INT)
 .addVar("double_x", SimpleType.DOUBLE)
 .addVar("bool_x", SimpleType.BOOL)
 .addVar("string_x", SimpleType.STRING)
 .addVar("int_list_x", ListType.create(SimpleType.INT))
 .addVar("double_list_x", ListType.create(SimpleType.DOUBLE))
 .addVar("dyn_list_x", ListType.create(SimpleType.DYN))
 .addVar("map_string_int_x", MapType.create(SimpleType.STRING, SimpleType.INT))
 .addVar("map_string_double_x", MapType.create(SimpleType.STRING, SimpleType.DOUBLE))
 .addVar("optional_int_x", OptionalType.create(SimpleType.INT))
 .addVar("optional_double_x", OptionalType.create(SimpleType.DOUBLE))
 .addVar("nested_list_int_x", ListType.create(ListType.create(SimpleType.INT)))
 .addVar("nested_list_double_x", ListType.create(ListType.create(SimpleType.DOUBLE)))
 .addVar(
 "nested_map_list_int_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.INT)))
 .addVar(
 "nested_map_list_double_x",
 MapType.create(SimpleType.STRING, ListType.create(SimpleType.DOUBLE)))
 .addVar("nullable_int_x", NullableType.create(SimpleType.INT))
 .addVar("nullable_double_x", NullableType.create(SimpleType.DOUBLE))
 .addVar("bool_var", SimpleType.BOOL)
 .addVar("list_var", ListType.create(SimpleType.STRING))
 .addVar("map_var", MapType.create(SimpleType.STRING, SimpleType.STRING))
Expand DownExpand Up@@ -151,7 +175,48 @@ private static Cel setupEnv(CelBuilder celBuilder) {
 @TestParameters("{source: '5 in [1, 1 + 2, 1 + (2 + 3)]', expected: 'false'}")
 @TestParameters("{source: '5 in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: '!(5 in [1, x, y, 5])', expected: 'false'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'true'}")
 @TestParameters("{source: 'x in [1, x, y, 5]', expected: 'x in [1, x, y, 5]'}")
 @TestParameters("{source: 'dyn_x in [1, 2, dyn_x]', expected: 'dyn_x in [1, 2, dyn_x]'}")
 @TestParameters("{source: 'int_x in [1, 2, int_x]', expected: 'true'}")
 @TestParameters("{source: 'bool_x in [true, false, bool_x]', expected: 'true'}")
 @TestParameters("{source: 'string_x in [\"a\", \"b\", string_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_x in [1.0, 2.0, double_x]', expected: 'double_x in [1.0, 2.0, double_x]'}")
 @TestParameters("{source: 'int_list_x in [[1], [2], int_list_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'double_list_x in [[1.0], double_list_x]', expected: 'double_list_x in [[1.0],"
 + " double_list_x]'}")
 @TestParameters(
 "{source: 'dyn_list_x in [[1], dyn_list_x]', expected: 'dyn_list_x in [[1], dyn_list_x]'}")
 @TestParameters(
 "{source: 'map_string_int_x in [{\"a\": 1}, map_string_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]', expected:"
 + " 'map_string_double_x in [{\"a\": 1.0}, map_string_double_x]'}")
 @TestParameters(
 "{source: 'optional_int_x in [optional.of(1), optional_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'optional_double_x in [optional.of(1.0), optional_double_x]', expected:"
 + " 'optional_double_x in [optional.of(1.0), optional_double_x]'}")
 @TestParameters("{source: 'nullable_int_x in [1, 2, nullable_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nullable_double_x in [1.0, 2.0, nullable_double_x]', expected:"
 + " 'nullable_double_x in [1.0, 2.0, nullable_double_x]'}")
 @TestParameters(
 "{source: 'double(\"NaN\") in [double(\"NaN\"), double_x]', expected: 'NaN in"
 + " [NaN, double_x]'}")
 @TestParameters(
 "{source: 'nested_list_int_x in [[[1]], [[2]], nested_list_int_x]', expected: 'true'}")
 @TestParameters(
 "{source: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]',"
 + " expected: 'nested_list_double_x in [[[1.0]], [[2.0]], nested_list_double_x]'}")
 @TestParameters(
 "{source: 'nested_map_list_int_x in [{\"a\": [1]}, nested_map_list_int_x]', expected:"
 + " 'true'}")
 @TestParameters(
 "{source: 'nested_map_list_double_x in [{\"a\": [1.0]}, nested_map_list_double_x]',"
 + " expected: 'nested_map_list_double_x in [{\"a\": [1.0]},"
 + " nested_map_list_double_x]'}")
 @TestParameters("{source: 'x in [1, 1 + 2, 1 + (2 + 3)]', expected: 'x in [1, 3, 6]'}")
 @TestParameters("{source: 'duration(string(7 * 24) + ''h'')', expected: 'duration(\"168h\")'}")
 @TestParameters("{source: '[1, ?optional.of(3)]', expected: '[1, 3]'}")
Expand DownExpand Up@@ -395,7 +460,8 @@ public void constantFold_protoMessageLiteral_success(String source, String expec
 @TestParameters(
 "{source: 'cel.bind(myMap, {\"foo\": \"bar\"}, myMap[?\"foo\"].optMap(x, x + \"baz\"))', "
 + "expected: 'optional.of(\"barbaz\")'}")
 @TestParameters("{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x'}")
 @TestParameters(
 "{source: '(1 + 2 + 3 == x) && (x in [1, 2, x])', expected: '6 == x && x in [1, 2, x]'}")
 public void constantFold_macros_macroCallMetadataPopulated(String source, String expected)
 throws Exception {
 Cel cel =
Expand DownExpand Up@@ -862,4 +928,20 @@ public void iterationLimitReached_throws() throws Exception {
 assertThrows(CelOptimizationException.class, () -> optimizer.optimize(ast));
 assertThat(e).hasMessageThat().contains("Optimization failure: Max iteration count reached.");
 }

 @Test
 public void constantFold_inOperator_withoutMacros_skipsDoubleNan() throws Exception {
 Cel celWithoutMacros =
 setupEnv(runtimeFlavor.builder()).toCelBuilder().setStandardMacros().build();
 CelOptimizer optimizer =
 CelOptimizerFactory.standardCelOptimizerBuilder(celWithoutMacros)
 .addAstOptimizers(ConstantFoldingOptimizer.getInstance())
 .build();
 CelAbstractSyntaxTree ast =
 celWithoutMacros.compile("double('NaN') in [double('NaN'), double_x]").getAst();

 CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

 assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("NaN in [NaN, double_x]");
 }
}

4 changes: 3 additions & 1 deletion
verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1775,7 +1775,8 @@ private enum EquivalenceTestCase {
 JSON_VALUE_OPTIONAL_NULL_VALUE_OF("google.protobuf.Value{?null_value: optional.of(0)}", "null"),
 OPTIONAL_INDEX_LIST_UNWRAPPING("optional.of([1, 2, 3])[?0]", "optional.of(1)"),
 OPTIONAL_INDEX_MAP_UNWRAPPING("optional.of({'a': 1})[?'a']", "optional.of(1)"),
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()");
 OPTIONAL_INDEX_UNWRAPPING_NONE("optional.none()[?0]", "optional.none()"),
 INT_IN_LIST_IDENTITY_EQUIVALENT("x in [1, 2, x]", "true");

 private final String exprA;
 private final String exprB;
Expand DownExpand Up@@ -1821,6 +1822,7 @@ private enum EquivalenceViolationTestCase {
 OPTIONAL_VALUE_VIOLATION("optional.of(x).value()", "y"),
 LIST_OPTIONAL_ELEMENTS_COLLISION("[1, ?opt_var]", "[1, opt_var]"),
 CROSS_NUMERIC_EQUALITY_INT_DYN_VIOLATION("1 == request", "false"),
 DYN_IN_LIST_NOT_EQUIVALENT_TO_TRUE("dyn_var in [1, 2, dyn_var]", "true"),
 OPTIONAL_SELECTION_VS_DIRECT_ERROR(
 "{'a': 1}.?missing_key", "optional.of({'a': 1}.missing_key)"),
 OPTIONAL_NESTED_NONE_VS_FLAT_NONE("{'a': optional.none()}.?a", "optional.none()"),
Expand Down
Loading