Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 77a9266

Browse files
committed
kconfig: remove wrong expr_trans_bool()
expr_trans_bool() performs an incorrect transformation. [Test Code] config MODULES def_bool y modules config A def_bool y select C if B != n config B def_tristate m config C tristate [Result] CONFIG_MODULES=y CONFIG_A=y CONFIG_B=m CONFIG_C=m This output is incorrect because CONFIG_C=y is expected. Documentation/kbuild/kconfig-language.rst clearly explains the function of the '!=' operator: If the values of both symbols are equal, it returns 'n', otherwise 'y'. Therefore, the statement: select C if B != n should be equivalent to: select C if y Or, more simply: select C Hence, the symbol C should be selected by the value of A, which is 'y'. However, expr_trans_bool() wrongly transforms it to: select C if B Therefore, the symbol C is selected by (A && B), which is 'm'. The comment block of expr_trans_bool() correctly explains its intention: * bool FOO!=n => FOO ^^^^ If FOO is bool, FOO!=n can be simplified into FOO. This is correct. However, the actual code performs this transformation when FOO is tristate: if (e->left.sym->type == S_TRISTATE) { ^^^^^^^^^^ While it can be fixed to S_BOOLEAN, there is no point in doing so because expr_tranform() already transforms FOO!=n to FOO when FOO is bool. (see the "case E_UNEQUAL" part) expr_trans_bool() is wrong and unnecessary. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Randy Dunlap <rdunlap@infradead.org>
1 parent 45c7f55 commit 77a9266

File tree

3 files changed

+0
-32
lines changed

3 files changed

+0
-32
lines changed

scripts/kconfig/expr.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -396,35 +396,6 @@ static struct expr *expr_eliminate_yn(struct expr *e)
396396
return e;
397397
}
398398

399-
/*
400-
* bool FOO!=n => FOO
401-
*/
402-
struct expr *expr_trans_bool(struct expr *e)
403-
{
404-
if (!e)
405-
return NULL;
406-
switch (e->type) {
407-
case E_AND:
408-
case E_OR:
409-
case E_NOT:
410-
e->left.expr = expr_trans_bool(e->left.expr);
411-
e->right.expr = expr_trans_bool(e->right.expr);
412-
break;
413-
case E_UNEQUAL:
414-
// FOO!=n -> FOO
415-
if (e->left.sym->type == S_TRISTATE) {
416-
if (e->right.sym == &symbol_no) {
417-
e->type = E_SYMBOL;
418-
e->right.sym = NULL;
419-
}
420-
}
421-
break;
422-
default:
423-
;
424-
}
425-
return e;
426-
}
427-
428399
/*
429400
* e1 || e2 -> ?
430401
*/

scripts/kconfig/expr.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ void expr_free(struct expr *e);
284284
void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
285285
int expr_eq(struct expr *e1, struct expr *e2);
286286
tristate expr_calc_value(struct expr *e);
287-
struct expr *expr_trans_bool(struct expr *e);
288287
struct expr *expr_eliminate_dups(struct expr *e);
289288
struct expr *expr_transform(struct expr *e);
290289
int expr_contains_symbol(struct expr *dep, struct symbol *sym);

scripts/kconfig/menu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,6 @@ static void _menu_finalize(struct menu *parent, bool inside_choice)
398398
dep = expr_transform(dep);
399399
dep = expr_alloc_and(expr_copy(basedep), dep);
400400
dep = expr_eliminate_dups(dep);
401-
if (menu->sym && menu->sym->type != S_TRISTATE)
402-
dep = expr_trans_bool(dep);
403401
prop->visible.expr = dep;
404402

405403
/*

0 commit comments

Comments
 (0)