diff options
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/builtin-check.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index f7e0ebac3fbe..80d9ed90d641 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -125,7 +125,7 @@ static bool ignore_func(struct objtool_file *file, struct symbol *func) static bool dead_end_function(struct objtool_file *file, struct symbol *func) { int i; - struct instruction *insn; + struct instruction *insn, *func_insn; bool empty = true; /* @@ -154,10 +154,11 @@ static bool dead_end_function(struct objtool_file *file, struct symbol *func) if (!func->sec) return false; - insn = find_instruction(file, func->sec, func->offset); - if (!insn) + func_insn = find_instruction(file, func->sec, func->offset); + if (!func_insn) return false; + insn = func_insn; list_for_each_entry_from(insn, &file->insns, list) { if (insn->sec != func->sec || insn->offset >= func->offset + func->len) @@ -167,6 +168,21 @@ static bool dead_end_function(struct objtool_file *file, struct symbol *func) if (insn->type == INSN_RETURN) return false; + } + + if (empty) + return false; + + /* + * A function can have a sibling call instead of a return. In that + * case, the function's dead-end status depends on whether the target + * of the sibling call returns. + */ + insn = func_insn; + list_for_each_entry_from(insn, &file->insns, list) { + if (insn->sec != func->sec || + insn->offset >= func->offset + func->len) + break; if (insn->type == INSN_JUMP_UNCONDITIONAL) { struct instruction *dest = insn->jump_dest; @@ -194,7 +210,7 @@ static bool dead_end_function(struct objtool_file *file, struct symbol *func) return false; } - return !empty; + return true; } /* |