The following commit has been merged into the objtool/core branch of tip: Commit-ID: a60e3f18ee0a280911b3aa4a5d756006cf766397 Gitweb: https://git.kernel.org/tip/a60e3f18ee0a280911b3aa4a5d756006cf766397 Author: Julien Thierry <jthierry@xxxxxxxxxx> AuthorDate: Fri, 27 Mar 2020 15:28:39 Committer: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> CommitterDate: Tue, 14 Apr 2020 10:39:24 -05:00 objtool: Remove redundant checks on operand type POP operations are already in the code path where the destination operand is OP_DEST_REG. There is no need to check the operand type again. Signed-off-by: Julien Thierry <jthierry@xxxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Miroslav Benes <mbenes@xxxxxxx> Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> --- tools/objtool/check.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 93fa7be..ed01059 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1733,15 +1733,13 @@ static int update_insn_state(struct instruction *insn, struct insn_state *state) case OP_SRC_POP: case OP_SRC_POPF: - if (!state->drap && op->dest.type == OP_DEST_REG && - op->dest.reg == cfa->base) { + if (!state->drap && op->dest.reg == cfa->base) { /* pop %rbp */ cfa->base = CFI_SP; } if (state->drap && cfa->base == CFI_BP_INDIRECT && - op->dest.type == OP_DEST_REG && op->dest.reg == state->drap_reg && state->drap_offset == -state->stack_size) {
![]() |