Skip to content

Skip redundant value constraints on elements of concretely typed lists and maps #1461

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
Nov 11, 2026
+25 −10
Merged

Skip redundant value constraints on elements of concretely typed lists and maps #1461

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
15 changes: 9 additions & 6 deletions verifier/src/main/java/dev/cel/verifier/CelZ3ComprehensionTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,15 @@ private void constrainIterationElement(
context.addConstraint(ctx.mkImplies(inBounds, (BoolExpr) selectExpr));
}

// Elements of a list, and keys of a map, are CEL values.
context.constrainValidValue(
ctx.mkAnd(
mapPresence == null ? typeSystem.isList(iterRange) : typeSystem.isMap(iterRange),
inBounds),
xVal);
// Elements of a list, and keys of a map, are CEL values. A concrete declared type already
// constrains them (performance only).
if (!CelZ3OperatorTranslator.hasConcreteElements(context.guaranteedType(iterRange))) {
context.constrainValidValue(
ctx.mkAnd(
mapPresence == null ? typeSystem.isList(iterRange) : typeSystem.isMap(iterRange),
inBounds),
xVal);
}
}

private TranslatedValue reduceAllOrExists(
Expand Down
20 changes: 16 additions & 4 deletions verifier/src/main/java/dev/cel/verifier/CelZ3OperatorTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,10 +659,16 @@ private BoolExpr unrollListEquality(
IntExpr idx = ctx.mkInt(i);
Expr<?> elem0 = ctx.mkNth(seq0, idx);
Expr<?> elem1 = ctx.mkNth(seq1, idx);
context.constrainValidValue(
ctx.mkAnd(typeSystem.isList(listA.z3Expr()), ctx.mkLt(idx, ctx.mkLength(seq0))), elem0);
context.constrainValidValue(
ctx.mkAnd(typeSystem.isList(listB.z3Expr()), ctx.mkLt(idx, ctx.mkLength(seq1))), elem1);
// A literal's elements, and a concrete declared type's, are already CEL values (performance
// only).
if (!listA.isLiteral(ExprKind.Kind.LIST) && !hasConcreteElements(type0)) {
context.constrainValidValue(
ctx.mkAnd(typeSystem.isList(listA.z3Expr()), ctx.mkLt(idx, ctx.mkLength(seq0))), elem0);
}
if (!listB.isLiteral(ExprKind.Kind.LIST) && !hasConcreteElements(type1)) {
context.constrainValidValue(
ctx.mkAnd(typeSystem.isList(listB.z3Expr()), ctx.mkLt(idx, ctx.mkLength(seq1))), elem1);
}

if (i >= comprehensionUnrollLimit) {
constrainListElement(seq0, idx, elem0, type0);
Expand Down Expand Up @@ -1138,6 +1144,12 @@ static boolean isStaticallyKnown(CelType type) {
return !kind.isDyn() && !kind.isTypeParam();
}

/** Whether {@code type} is a list or map whose elements (or keys) have a concrete type. */
static boolean hasConcreteElements(CelType type) {
return (type instanceof ListType || type instanceof MapType)
&& isConcrete(type.parameters().get(0));
}

/** Whether {@code type} and, recursively, its type parameters are statically known. */
private static boolean isConcrete(CelType type) {
return isStaticallyKnown(type)
Expand Down
Loading