Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter: Apply constant promotion for FI_EQ / FI_NEQ

Browse source 
Equality comparison is defined on all values, even of different
types, but we still want to do constant promotion if possible.
This commit is contained in:
Ondrej Zajicek (work) 2022-03-04 17:51:50 +01:00 committed by Ondrej Zajicek
parent b2d6d2948a
commit fb1d8f6513
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
filter/data.c
View file

@ -192,7 +192,7 @@ val_compare(const struct f_val *v1, const struct f_val *v2)
if (val_is_ip4(v1) && (v2->type == T_QUAD)) if (val_is_ip4(v1) && (v2->type == T_QUAD))
return uint_cmp(ipa_to_u32(v1->val.ip), v2->val.i); return uint_cmp(ipa_to_u32(v1->val.ip), v2->val.i);
debug( "Types do not match in val_compare\n" ); DBG( "Types do not match in val_compare\n" );
return F_CMP_ERROR; return F_CMP_ERROR;
} }

6
filter/decl.m4
View file

@ -186,6 +186,12 @@ if (f$1->type && f$2->type && (f$1->type != f$2->type) &&
cf_error("Arguments $1 and $2 of %s must be of the same type", f_instruction_name(what->fi_code)); cf_error("Arguments $1 and $2 of %s must be of the same type", f_instruction_name(what->fi_code));
FID_INTERPRET_BODY()') FID_INTERPRET_BODY()')
m4_define(ARG_PREFER_SAME_TYPE, `
FID_NEW_BODY()m4_dnl
if (f$1->type && f$2->type && (f$1->type != f$2->type))
(void) (f_const_promotion(f$2, f$1->type) || f_const_promotion(f$1, f$2->type));
FID_INTERPRET_BODY()')
# Executing another filter line. This replaces the recursion # Executing another filter line. This replaces the recursion
# that was needed in the former implementation. # that was needed in the former implementation.
m4_define(LINEX, `FID_INTERPRET_EXEC()LINEX_($1)FID_INTERPRET_NEW()return $1 FID_INTERPRET_BODY()') m4_define(LINEX, `FID_INTERPRET_EXEC()LINEX_($1)FID_INTERPRET_NEW()return $1 FID_INTERPRET_BODY()')

2
filter/f-inst.c
View file

@ -423,12 +423,14 @@
INST(FI_NEQ, 2, 1) { INST(FI_NEQ, 2, 1) {
ARG_ANY(1); ARG_ANY(1);
ARG_ANY(2); ARG_ANY(2);
ARG_PREFER_SAME_TYPE(1, 2);
RESULT(T_BOOL, i, !val_same(&v1, &v2)); RESULT(T_BOOL, i, !val_same(&v1, &v2));
} }
INST(FI_EQ, 2, 1) { INST(FI_EQ, 2, 1) {
ARG_ANY(1); ARG_ANY(1);
ARG_ANY(2); ARG_ANY(2);
ARG_PREFER_SAME_TYPE(1, 2);
RESULT(T_BOOL, i, val_same(&v1, &v2)); RESULT(T_BOOL, i, val_same(&v1, &v2));
} }

8
filter/test.conf
View file

@ -498,8 +498,8 @@ prefix set s1;
s0 = []; s0 = [];
s1 = []; s1 = [];
bt_assert(pxs != s0); bt_assert(pxs != s0);
bt_assert(pxs = s1); bt_assert(pxs = s1);
#bt_assert(pxs = []); bt_assert(pxs = []);
} }
function t_prefix_set() function t_prefix_set()
@ -507,7 +507,7 @@ prefix set pxs;
{ {
pxs = []; pxs = [];
bt_assert(format(pxs) = "[]"); bt_assert(format(pxs) = "[]");
#bt_assert(pxs = []); bt_assert(pxs = []);
bt_assert(1.2.0.0/16 !~ []); bt_assert(1.2.0.0/16 !~ []);
bt_assert(1.2.0.0/16 !~ pxs); bt_assert(1.2.0.0/16 !~ pxs);
@ -600,7 +600,7 @@ prefix set pxs;
{ {
pxs = []; pxs = [];
bt_assert(format(pxs) = "[]"); bt_assert(format(pxs) = "[]");
#bt_assert(pxs = []); bt_assert(pxs = []);
bt_assert(12::34/128 !~ []); bt_assert(12::34/128 !~ []);
bt_assert(12::34/128 !~ pxs); bt_assert(12::34/128 !~ pxs);