perf llvm: Clean up after a failed disassembly
PATCH 1/1 perf llvm: Clean up after a failed disassembly
An error returned from a failed backend will cause perf to call the next backend. If the error happens mid-function, e.g. due to an unrecognized instruction, we will end up with duplicated instructions in the output unless the backend that failed deletes any instructions that it created before failing. The capstone backend was already doing this but the LLVM backend was not; fix it.
--- tools/perf/util/llvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/perf/util/llvm.c +9 -0
@@ -261,6 +261,15 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, ret =0 ; err: +if (ret !=0 ) { +struct disasm_line *tmp; + +list_for_each_entry_safe (dl, tmp, ¬es->src->source, + al.node) { +list_del (&dl->al.node); +disasm_line__free (dl); + } + }LLVMDisasmDispose (disasm);free (code_buf);free (line_storage);
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Quoted 10 lines · Peter Collingbourne
An error returned from a failed backend will cause perf to call the next backend. If the error happens mid-function, e.g. due to an unrecognized instruction, we will end up with duplicated instructions in the output unless the backend that failed deletes any instructions that it created before failing. The capstone backend was already doing this but the LLVM backend was not; fix it.
Thanks,
Ian
Quoted 27 lines
--- tools/perf/util/llvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)tools/perf/util/llvm.c +9
-1@@ -261,6 +261,15 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, ret =0 ; err: +if (ret !=0 ) { +struct disasm_line *tmp; + +list_for_each_entry_safe (dl, tmp, ¬es->src->source, + al.node) { +list_del (&dl->al.node); +disasm_line__free (dl); + } + }LLVMDisasmDispose (disasm);free (code_buf);free (line_storage); --2.53.0.473.g4a7958ca14-goog
Quoted 10 lines · Ian Rogers
Quoted 8 lines · Peter Collingbourne
An error returned from a failed backend will cause perf to call the next backend. If the error happens mid-function, e.g. due to an unrecognized instruction, we will end up with duplicated instructions in the output unless the backend that failed deletes any instructions that it created before failing. The capstone backend was already doing this but the LLVM backend was not; fix it.
Quoted 4 lines
Quoted 2 lines
Reviewed-by Ian Rogers <[email protected]>
Thanks for the review. I guess this one should have also had
Peter
Quoted 11 lines · Peter Collingbourne
Quoted 10 lines · Ian Rogers
Quoted 8 lines · Peter Collingbourne
An error returned from a failed backend will cause perf to call the next backend. If the error happens mid-function, e.g. due to an unrecognized instruction, we will end up with duplicated instructions in the output unless the backend that failed deletes any instructions that it created before failing. The capstone backend was already doing this but the LLVM backend was not; fix it.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Reviewed-by Ian Rogers <[email protected]>Thanks for the review. I guess this one should have also had
Fixes 048856817888 ("perf annotate: LLVM-based disassembler")
Thanks, applied to perf-tools, for v7.0.
- Arnaldo