From 7525b645dfaa302091591d0f87d9682ce988ed13 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 4 Sep 2017 16:01:17 +0100 Subject: [PATCH] Fix build breakage when libipt is available MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix build regression introduced by 0860c437cbe4 ("btrace: Store btrace_insn in an std::vector"): src/gdb/btrace.c: In function ‘void ftrace_add_pt(btrace_thread_info*, pt_insn_decoder*, int*, std::vector&)’: src/gdb/btrace.c:1329:38: error: invalid initialization of reference of type ‘const btrace_insn&’ from expression of type ‘btrace_insn*’ ftrace_update_insns (bfun, &btinsn); ^ src/gdb/btrace.c:648:1: note: in passing argument 2 of ‘void ftrace_update_insns(btrace_function*, const btrace_insn&)’ ftrace_update_insns (struct btrace_function *bfun, const btrace_insn &insn) ^ gdb/ChangeLog: 2017-09-04 Pedro Alves * btrace.c (ftrace_add_pt): Pass btrace_insn to ftrace_update_insns by reference instead of pointer. --- gdb/ChangeLog | 5 +++++ gdb/btrace.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 306805025a5..a70fb7b5b30 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-09-04 Pedro Alves + + * btrace.c (ftrace_add_pt): Pass btrace_insn to + ftrace_update_insns by reference instead of pointer. + 2017-09-04 Yao Qi * i386-go32-tdep.c: Include x86-xstate.h. diff --git a/gdb/btrace.c b/gdb/btrace.c index 6d2a9c480e5..d9810f36879 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -1325,8 +1325,7 @@ ftrace_add_pt (struct btrace_thread_info *btinfo, /* Maintain the function level offset. */ *plevel = std::min (*plevel, bfun->level); - btrace_insn btinsn = pt_btrace_insn (insn); - ftrace_update_insns (bfun, &btinsn); + ftrace_update_insns (bfun, pt_btrace_insn (insn)); } if (status == -pte_eos) -- 2.30.2