From 7634874591d0aa63c72047bfa401ae009234072d Mon Sep 17 00:00:00 2001 From: Doug Moore Date: Fri, 19 May 2017 17:59:08 -0500 Subject: [PATCH] Move the change to c->ret_addr_column to the end of dwarf_step, to make sure that it gets set in the cache hit case. --- src/dwarf/Gparser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dwarf/Gparser.c b/src/dwarf/Gparser.c index 2600ce39..698dd49a 100644 --- a/src/dwarf/Gparser.c +++ b/src/dwarf/Gparser.c @@ -516,7 +516,6 @@ setup_fde (struct dwarf_cursor *c, dwarf_state_record_t *sr) set_reg (sr, i, DWARF_WHERE_SAME, 0); struct dwarf_cie_info *dci = c->pi.unwind_info; - c->ret_addr_column = dci->ret_addr_column; sr->rs_current.ret_addr_column = dci->ret_addr_column; unw_word_t addr = dci->cie_instr_start; unw_word_t curr_ip = 0; @@ -942,6 +941,7 @@ dwarf_step (struct dwarf_cursor *c) return ret; if ((ret = apply_reg_state (c, &sr.rs_current)) < 0) return ret; + c->ret_addr_column = sr.rs_current.ret_addr_column; return 1; }