kconfig: warn unmet direct dependency of tristate symbols selected by y

Commit 246cf9c26bf1 ("kbuild: Warn on selecting symbols with unmet
direct dependencies") forcibly promoted ->dir_dep.tri to yes from mod.
So, the unmet direct dependencies of tristate symbols are not reported.

[Test Case]

  config MODULES
          def_bool y
          option modules

  config A
          def_bool y
          select B

  config B
          tristate "B"
          depends on m

This causes unmet dependency because 'B' is forced 'y' ignoring
'depends on m'.  This should be warned.

On the other hand, the following case ('B' is bool) should not be
warned, so 'depends on m' for bool symbols should be naturally treated
as 'depends on y'.

[Test Case2 (not unmet dependency)]

  config MODULES
          def_bool y
          option modules

  config A
          def_bool y
          select B

  config B
          bool "B"
          depends on m

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/config/symbol.c b/config/symbol.c
index 0f7eba7d472a6a762e154bbcfede05b0ef8044db..6acf536c9726846913d4321460c946d3042d171d 100644 (file)
--- a/config/symbol.c
+++ b/config/symbol.c
@@ -243,7 +243,7 @@ static void sym_calc_visibility(struct symbol *sym)
        tri = yes;
        if (sym->dir_dep.expr)
                tri = expr_calc_value(sym->dir_dep.expr);
        tri = yes;
        if (sym->dir_dep.expr)
                tri = expr_calc_value(sym->dir_dep.expr);

-       if (tri == mod)
+       if (tri == mod && sym_get_type(sym) == S_BOOLEAN)

                tri = yes;
        if (sym->dir_dep.tri != tri) {
                sym->dir_dep.tri = tri;
                tri = yes;
        if (sym->dir_dep.tri != tri) {
                sym->dir_dep.tri = tri;


@@ -414,7 +414,7 @@ void sym_calc_value(struct symbol *sym)
                                }
                        }
                calc_newval:
                                }
                        }
                calc_newval:

-                       if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
+                       if (sym->dir_dep.tri < sym->rev_dep.tri) {

                                struct expr *e;
                                e = expr_simplify_unmet_dep(sym->rev_dep.expr,
                                    sym->dir_dep.expr);
                                struct expr *e;
                                e = expr_simplify_unmet_dep(sym->rev_dep.expr,
                                    sym->dir_dep.expr);