Skip to content

Override environment's expected result type during constant folding #815

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
Merged

Override environment's expected result type during constant folding #815

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
1 change: 1 addition & 0 deletions optimizer/src/main/java/dev/cel/optimizer/optimizers/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ java_library(
"//common/ast",
"//common/ast:mutable_expr",
"//common/navigation:mutable_navigation",
"//common/types",
"//extensions:optional_library",
"//optimizer:ast_optimizer",
"//optimizer:mutable_ast",
Expand Down
6 changes: 5 additions & 1 deletion optimizer/src/main/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import dev.cel.common.ast.CelMutableExprConverter;
import dev.cel.common.navigation.CelNavigableMutableAst;
import dev.cel.common.navigation.CelNavigableMutableExpr;
import dev.cel.common.types.SimpleType;
import dev.cel.extensions.CelOptionalLibrary.Function;
import dev.cel.optimizer.AstMutator;
import dev.cel.optimizer.CelAstOptimizer;
Expand Down Expand Up @@ -88,6 +89,9 @@ private static CelMutableExpr newOptionalNoneExpr() {
@Override
public OptimizationResult optimize(CelAbstractSyntaxTree ast, Cel cel)
throws CelOptimizationException {
// Override the environment's expected type to generally allow all subtrees to be folded.
Cel optimizerEnv = cel.toCelBuilder().setResultType(SimpleType.DYN).build();

CelMutableAst mutableAst = CelMutableAst.fromCelAst(ast);
int iterCount = 0;
boolean continueFolding = true;
Expand All @@ -112,7 +116,7 @@ public OptimizationResult optimize(CelAbstractSyntaxTree ast, Cel cel)
mutatedResult = maybePruneBranches(mutableAst, foldableExpr.expr());
if (!mutatedResult.isPresent()) {
// Evaluate the call then fold
mutatedResult = maybeFold(cel, mutableAst, foldableExpr);
mutatedResult = maybeFold(optimizerEnv, mutableAst, foldableExpr);
}

if (!mutatedResult.isPresent()) {
Expand Down
14 changes: 14 additions & 0 deletions optimizer/src/test/java/dev/cel/optimizer/optimizers/ConstantFoldingOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,20 @@ public void constantFold_addFoldableFunction_success() throws Exception {
assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("true");
}

@Test
public void constantFold_withExpectedResultTypeSet_success() throws Exception {
Cel cel = CelFactory.standardCelBuilder().setResultType(SimpleType.STRING).build();
CelOptimizer optimizer =
CelOptimizerFactory.standardCelOptimizerBuilder(cel)
.addAstOptimizers(ConstantFoldingOptimizer.getInstance())
.build();
CelAbstractSyntaxTree ast = cel.compile("string(!true)").getAst();

CelAbstractSyntaxTree optimizedAst = optimizer.optimize(ast);

assertThat(CEL_UNPARSER.unparse(optimizedAst)).isEqualTo("\"false\"");
}

@Test
public void constantFold_withMacroCallPopulated_comprehensionsAreReplacedWithNotSet()
throws Exception {
Expand Down
Loading