Fix logical operator folding that only involve literals (#833)

google · Sep 1, 2023 · 4eebcf3 · 4eebcf3
1 parent bfccebd
commit 4eebcf3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/cel/folding.go b/cel/folding.go
@@ -206,6 +206,11 @@ func maybeShortcircuitLogic(ctx *OptimizerContext, function string, args []ast.E
 			return true
 		}
 	}
+	if len(newArgs) == 0 {
+		newArgs = append(newArgs, args[0])
+		expr.SetKindCase(newArgs[0])
+		return true
+	}
 	if len(newArgs) == 1 {
 		expr.SetKindCase(newArgs[0])
 		return true

diff --git a/cel/folding_test.go b/cel/folding_test.go
@@ -197,6 +197,30 @@ func TestConstantFoldingOptimizer(t *testing.T) {
 			expr:   `false || x || false || x`,
 			folded: `x || x`,
 		},
+		{
+			expr:   `true && true`,
+			folded: `true`,
+		},
+		{
+			expr:   `true && false`,
+			folded: `false`,
+		},
+		{
+			expr:   `true || false`,
+			folded: `true`,
+		},
+		{
+			expr:   `false || false`,
+			folded: `false`,
+		},
+		{
+			expr:   `true && false || true`,
+			folded: `true`,
+		},
+		{
+			expr:   `false && true || false`,
+			folded: `false`,
+		},
 		{
 			expr:   `null`,
 			folded: `null`,