Skip to content

Commit 8be371e

Browse files
xur-llvmopsiff
authored andcommitted
objtool: Fix unreachable instruction warnings for weak functions
[ Upstream commit 18e8850 ] In the presence of both weak and strong function definitions, the linker drops the weak symbol in favor of a strong symbol, but leaves the code in place. Code in ignore_unreachable_insn() has some heuristics to suppress the warning, but it does not work when -ffunction-sections is enabled. Suppose function foo has both strong and weak definitions. Case 1: The strong definition has an annotated section name, like .init.text. Only the weak definition will be placed into .text.foo. But since the section has no symbols, there will be no "hole" in the section. Case 2: Both sections are without an annotated section name. Both will be placed into .text.foo section, but there will be only one symbol (the strong one). If the weak code is before the strong code, there is no "hole" as it fails to find the right-most symbol before the offset. The fix is to use the first node to compute the hole if hole.sym is empty. If there is no symbol in the section, the first node will be NULL, in which case, -1 is returned to skip the whole section. Co-developed-by: Han Shen <[email protected]> Signed-off-by: Han Shen <[email protected]> Signed-off-by: Rong Xu <[email protected]> Suggested-by: Sriraman Tallam <[email protected]> Suggested-by: Krzysztof Pszeniczny <[email protected]> Tested-by: Yonghong Song <[email protected]> Tested-by: Yabin Cui <[email protected]> Tested-by: Nathan Chancellor <[email protected]> Reviewed-by: Kees Cook <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]> [ Backport from v6.13 ] Signed-off-by: WangYuli <[email protected]>
1 parent e99b615 commit 8be371e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

tools/objtool/elf.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,17 @@ int find_symbol_hole_containing(const struct section *sec, unsigned long offset)
226226
if (n)
227227
return 0; /* not a hole */
228228

229-
/* didn't find a symbol for which @offset is after it */
230-
if (!hole.sym)
231-
return 0; /* not a hole */
229+
/*
230+
* @offset >= sym->offset + sym->len, find symbol after it.
231+
* When hole.sym is empty, use the first node to compute the hole.
232+
* If there is no symbol in the section, the first node will be NULL,
233+
* in which case, -1 is returned to skip the whole section.
234+
*/
235+
if (hole.sym)
236+
n = rb_next(&hole.sym->node);
237+
else
238+
n = rb_first_cached(&sec->symbol_tree);
232239

233-
/* @offset >= sym->offset + sym->len, find symbol after it */
234-
n = rb_next(&hole.sym->node);
235240
if (!n)
236241
return -1; /* until end of address space */
237242

0 commit comments

Comments
 (0)