Commit 440f67cc authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: refactor expr_eliminate_dups() 



Currently, expr_eliminate_dups() passes two identical pointers down to
expr_eliminate_dups1(), which later skips processing identical leaves.

This approach is somewhat tricky and, more importantly, it will not work
with the refactoring made in the next commit.

This commit slightly changes the recursion logic; it deduplicates both
the left and right arms, and then passes them to expr_eliminate_dups1().
expr_eliminate_dups() should produce the same result.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 4fa146ea

scripts/kconfig/expr.c

+3 −11
Original line number Diff line number Diff line
@@ -578,16 +578,6 @@ static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct 


	/* *ep1 and *ep2 are leaves. Compare and process them. */



	if (*ep1 == *ep2)

		return;



	switch ((*ep1)->type) {

	case E_OR: case E_AND:

		expr_eliminate_dups1((*ep1)->type, ep1, ep1);

	default:

		;

	}



	switch (type) {

	case E_OR:

		tmp = expr_join_or(*ep1, *ep2);
@@ -634,7 +624,9 @@ struct expr *expr_eliminate_dups(struct expr *e) 
		trans_count = 0;

		switch (e->type) {

		case E_OR: case E_AND:

			expr_eliminate_dups1(e->type, &e, &e);

			e->left.expr = expr_eliminate_dups(e->left.expr);

			e->right.expr = expr_eliminate_dups(e->right.expr);

			expr_eliminate_dups1(e->type, &e->left.expr, &e->right.expr);

		default:

			;

		}