optimize: more robust statement merge with vmap
Pablo Neira Ayuso
maintainerPATCH 1/2 optimize: more robust statement merge with vmap
Check expressions that are expected on the rhs rather than using a catch-all default case.
Fixes 1542082e259b ("optimize: merge same selector with different verdict into verdict map")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/optimize.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
src/optimize.c +6 -1
@@ -445,12 +445,17 @@ static void build_verdict_map(struct expr *expr, struct stmt *verdict, struct excompound_expr_add (set, mapping); }break ; -default : +case EXPR_VALUE : +case EXPR_PREFIX : +case EXPR_RANGE : elem =set_elem_expr_alloc (&internal_location,expr_get (expr)); mapping =mapping_expr_alloc (&internal_location, elem,expr_get (verdict->expr));compound_expr_add (set, mapping);break ; +default : +assert (0 ); +break ; } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 optimize: incorrect assert() for unexpected expression type
assert(1) is noop, this should be assert(0) instead.
Fixes 561aa3cfa8da ("optimize: merge verdict maps with same lookup key")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/optimize.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
src/optimize.c +3 -3
@@ -362,11 +362,11 @@ static void merge_verdict_stmts(const struct optimize_ctx *ctx,merge_vmap (ctx, stmt_a, stmt_b);break ;default : -assert (1 ); +assert (0 ); }break ;default : -assert (1 ); +assert (0 );break ; } }
@@ -385,7 +385,7 @@ static void merge_stmts(const struct optimize_ctx *ctx,merge_verdict_stmts (ctx, from, to, merge, stmt_a);break ;default : -assert (1 ); +assert (0 ); } }
Signature · 1 line
2.30.2