Commit 68fef670 authored May 24, 2022 by Masahiro Yamada

modpost: squash if...else-if in find_elf_symbol2()



if ((addr - sym->st_value) < distance) {
            distance = addr - sym->st_value;
            near = sym;
    } else if ((addr - sym->st_value) == distance) {
            near = sym;
    }

is equivalent to:

    if (addr - sym->st_value <= distance) {
            distance = addr - sym->st_value;
            near = sym;
    }

(The else-if block can overwrite 'distance' with the same value).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

parent c5c468dc

scripts/mod/modpost.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -1270,13 +1270,9 @@ static Elf_Sym find_elf_symbol2(struct elf_info elf, Elf_Addr addr,
		continue;
		if (!is_valid_name(elf, sym))
		continue;
		if (sym->st_value <= addr) {
		if ((addr - sym->st_value) < distance) {
		if (sym->st_value <= addr && addr - sym->st_value <= distance) {
		distance = addr - sym->st_value;
		near = sym;
		} else if ((addr - sym->st_value) == distance) {
		near = sym;
		}
		}
		}
		return near;