From 8f52fe7ba6cd681f3c98d42b5c84fbc094b46864 Mon Sep 17 00:00:00 2001 From: Sean Huh Date: Tue, 10 Nov 2026 15:22:40 -0800 Subject: [PATCH] Compare `google.protobuf.Any` values numerically across int, uint and double PiperOrigin-RevId: 1018599434 --- .../main/java/dev/cel/verifier/CelZ3OperatorTranslator.java | 4 ++-- .../src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/verifier/src/main/java/dev/cel/verifier/CelZ3OperatorTranslator.java b/verifier/src/main/java/dev/cel/verifier/CelZ3OperatorTranslator.java index a44f730dd..8aaafcd60 100644 --- a/verifier/src/main/java/dev/cel/verifier/CelZ3OperatorTranslator.java +++ b/verifier/src/main/java/dev/cel/verifier/CelZ3OperatorTranslator.java @@ -721,8 +721,8 @@ private TranslatedValue translateEquality( } else if (isStaticallyKnown(type0) && isStaticallyKnown(type1)) { equality = typeSystem.getStructuralEquality(z3Arg0, z3Arg1); } else { - boolean canBeNumeric0 = type0.kind() == CelKind.DYN || isNumericType(type0); - boolean canBeNumeric1 = type1.kind() == CelKind.DYN || isNumericType(type1); + boolean canBeNumeric0 = !isStaticallyKnown(type0) || isNumericType(type0); + boolean canBeNumeric1 = !isStaticallyKnown(type1) || isNumericType(type1); // Check if one side is an explicit LIST that we can unroll BoolExpr structuralEq = typeSystem.getStructuralEquality(z3Arg0, z3Arg1); diff --git a/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java b/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java index 94d10613a..c40cba230 100644 --- a/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java +++ b/verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java @@ -169,6 +169,8 @@ private enum IsSatisfiableTestCase { DYNAMIC_MAP_COMPREHENSION_EXISTS("string_int_map.exists(k, k == 'test')", "string_int_map = "), NULL_SATISFIABLE("unknown_var == null", "unknown_var = null"), DYNAMIC_VAR_NUMERIC_EQUALITY("dyn_var == 1 && dyn_var == 1.0", "dyn_var = 1"), + ANY_NUMERIC_EQUALITY( + "test_all_types.single_any == 1 && 1.0 == test_all_types.single_any", "test_all_types = "), DYNAMIC_VAR_NOT_IN_LIST( "dyn_var == 1.5 && !(dyn_var in dyn_list) && size(dyn_list) == 6", "dyn_var = 1\\.5"), DYNAMIC_LIST_EQUALITY_BEYOND_BMC_LIMIT("dyn_list == [1, 2, 3, 4, 5, 6]", "dyn_list = "),