Skip to content

Remove dead code in interpreter util #751

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
Jul 21, 2025
Merged

Remove dead code in interpreter util #751

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
5 changes: 2 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/DefaultInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,8 @@ private IntermediateResult mergeBooleanUnknowns(IntermediateResult lhs, Intermed
return rhs;
}

// Otherwise fallback to normal impl
return IntermediateResult.create(
InterpreterUtil.shortcircuitUnknownOrThrowable(lhsVal, rhsVal));
// Otherwise, enforce strictness on both args
return IntermediateResult.create(InterpreterUtil.enforceStrictness(lhsVal, rhsVal));
}

private enum ShortCircuitableOperators {
Expand Down
39 changes: 3 additions & 36 deletions runtime/src/main/java/dev/cel/runtime/InterpreterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

import com.google.errorprone.annotations.CheckReturnValue;
import dev.cel.common.annotations.Internal;
import java.util.LinkedHashSet;
import java.util.Set;
import org.jspecify.annotations.Nullable;

/**
Expand Down Expand Up @@ -74,42 +72,11 @@ static AccumulatedUnknowns adaptToAccumulatedUnknowns(CelUnknownSet unknowns) {
return AccumulatedUnknowns.create(unknowns.unknownExprIds(), unknowns.attributes());
}

static AccumulatedUnknowns combineUnknownExprValue(Object... objs) {
Set<Long> ids = new LinkedHashSet<>();
for (Object object : objs) {
if (isAccumulatedUnknowns(object)) {
ids.addAll(((AccumulatedUnknowns) object).exprIds());
}
}

return AccumulatedUnknowns.create(ids);
}

/**
* Short circuit unknown or error arguments to logical operators.
*
* <p>Given two arguments, one of which must be throwable (error) or unknown, returns the result
* from the && or || operators for these arguments, assuming that the result cannot be determined
* from any boolean arguments alone. This allows us to consolidate the error/unknown handling for
* both of these operators.
* Enforces strictness on both lhs/rhs arguments from logical operators (i.e: intentionally throws
* an appropriate exception when {@link Throwable} is encountered as part of evaluated result.
*/
public static Object shortcircuitUnknownOrThrowable(Object left, Object right)
throws CelEvaluationException {
// unknown <op> unknown ==> unknown combined
if (InterpreterUtil.isAccumulatedUnknowns(left)
&& InterpreterUtil.isAccumulatedUnknowns(right)) {
return InterpreterUtil.combineUnknownExprValue(left, right);
}
// unknown <op> <error> ==> unknown
// unknown <op> t|f ==> unknown
if (InterpreterUtil.isAccumulatedUnknowns(left)) {
return left;
}
// <error> <op> unknown ==> unknown
// t|f <op> unknown ==> unknown
if (InterpreterUtil.isAccumulatedUnknowns(right)) {
return right;
}
public static Object enforceStrictness(Object left, Object right) throws CelEvaluationException {
// Throw left or right side exception for now, should combine them into ErrorSet.
// <error> <op> <error> ==> <error>
if (left instanceof Throwable) {
Expand Down