From c66661f73cb66513e9c08897ab38e89c4ca96407 Mon Sep 17 00:00:00 2001
From: Doug Moore <dougm@rice.edu>
Date: Fri, 19 May 2017 19:19:12 -0500
Subject: [PATCH] Drop reference to dwarf.ret_addr_column.

---
 include/dwarf.h     | 1 -
 src/aarch64/init.h  | 1 -
 src/arm/init.h      | 1 -
 src/dwarf/Gparser.c | 6 +-----
 src/hppa/Gstep.c    | 1 -
 src/mips/init.h     | 1 -
 src/ppc32/init.h    | 1 -
 src/ppc64/init.h    | 1 -
 src/sh/init.h       | 1 -
 src/tilegx/init.h   | 1 -
 src/x86/Gstep.c     | 1 -
 src/x86/init.h      | 1 -
 src/x86_64/Gstep.c  | 2 --
 src/x86_64/init.h   | 1 -
 14 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/include/dwarf.h b/include/dwarf.h
index 759883c0..e1f7825c 100644
--- a/include/dwarf.h
+++ b/include/dwarf.h
@@ -313,7 +313,6 @@ typedef struct dwarf_cursor
     unw_word_t cfa;     /* canonical frame address; aka frame-/stack-pointer */
     unw_word_t ip;              /* instruction pointer */
     unw_word_t args_size;       /* size of arguments */
-    unw_word_t ret_addr_column; /* column for return-address */
     unw_word_t eh_args[UNW_TDEP_NUM_EH_REGS];
     unsigned int eh_valid_mask;
 
diff --git a/src/aarch64/init.h b/src/aarch64/init.h
index 0cedc1af..5dab60bb 100644
--- a/src/aarch64/init.h
+++ b/src/aarch64/init.h
@@ -115,7 +115,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_pc = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/arm/init.h b/src/arm/init.h
index 6379d8ec..7d765ecf 100644
--- a/src/arm/init.h
+++ b/src/arm/init.h
@@ -66,7 +66,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   /* FIXME: Initialisation for other registers.  */
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/dwarf/Gparser.c b/src/dwarf/Gparser.c
index 3fdd8c83..b1f9dd04 100644
--- a/src/dwarf/Gparser.c
+++ b/src/dwarf/Gparser.c
@@ -943,11 +943,7 @@ dwarf_step (struct dwarf_cursor *c)
   dwarf_state_record_t sr;
   if ((ret = find_reg_state (c, &sr)) < 0)
     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 ret;
+  return apply_reg_state (c, &sr.rs_current);
 }
 
 HIDDEN int
diff --git a/src/hppa/Gstep.c b/src/hppa/Gstep.c
index 078ff430..b9e170a2 100644
--- a/src/hppa/Gstep.c
+++ b/src/hppa/Gstep.c
@@ -60,7 +60,6 @@ unw_step (unw_cursor_t *cursor)
 
           c->sigcontext_format = HPPA_SCF_LINUX_RT_SIGFRAME;
           c->sigcontext_addr = sc_addr;
-          c->dwarf.ret_addr_column = UNW_HPPA_RP;
 
           if ((ret = dwarf_get (&c->dwarf, iaoq_loc, &ip)) < 0)
             {
diff --git a/src/mips/init.h b/src/mips/init.h
index 74c3ab95..30c193a1 100644
--- a/src/mips/init.h
+++ b/src/mips/init.h
@@ -48,7 +48,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   /* FIXME: Initialisation for other registers.  */
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/ppc32/init.h b/src/ppc32/init.h
index e8bb3ba5..87a69b14 100644
--- a/src/ppc32/init.h
+++ b/src/ppc32/init.h
@@ -61,7 +61,6 @@ common_init_ppc32 (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_addr = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/ppc64/init.h b/src/ppc64/init.h
index 22376e71..9b813934 100644
--- a/src/ppc64/init.h
+++ b/src/ppc64/init.h
@@ -71,7 +71,6 @@ common_init_ppc64 (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_addr = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/sh/init.h b/src/sh/init.h
index a180258e..36713fe8 100644
--- a/src/sh/init.h
+++ b/src/sh/init.h
@@ -62,7 +62,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_pc = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/tilegx/init.h b/src/tilegx/init.h
index e75e590b..0e0f7fd1 100644
--- a/src/tilegx/init.h
+++ b/src/tilegx/init.h
@@ -52,7 +52,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
     return ret;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/x86/Gstep.c b/src/x86/Gstep.c
index 517dd62a..8cec72ef 100644
--- a/src/x86/Gstep.c
+++ b/src/x86/Gstep.c
@@ -90,7 +90,6 @@ unw_step (unw_cursor_t *cursor)
           c->dwarf.loc[EIP] = eip_loc;
           c->dwarf.use_prev_instr = 1;
         }
-      c->dwarf.ret_addr_column = EIP;
 
       if (!DWARF_IS_NULL_LOC (c->dwarf.loc[EBP]))
         {
diff --git a/src/x86/init.h b/src/x86/init.h
index 027aedc3..b0db8d33 100644
--- a/src/x86/init.h
+++ b/src/x86/init.h
@@ -58,7 +58,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_addr = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = 0;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;
diff --git a/src/x86_64/Gstep.c b/src/x86_64/Gstep.c
index b95adfa7..5af13e0c 100644
--- a/src/x86_64/Gstep.c
+++ b/src/x86_64/Gstep.c
@@ -197,8 +197,6 @@ unw_step (unw_cursor_t *cursor)
           c->dwarf.use_prev_instr = 1;
         }
 
-      c->dwarf.ret_addr_column = RIP;
-
       if (DWARF_IS_NULL_LOC (c->dwarf.loc[RBP]))
         {
           ret = 0;
diff --git a/src/x86_64/init.h b/src/x86_64/init.h
index 442b2bf7..3ceab791 100644
--- a/src/x86_64/init.h
+++ b/src/x86_64/init.h
@@ -77,7 +77,6 @@ common_init (struct cursor *c, unsigned use_prev_instr)
   c->sigcontext_addr = 0;
 
   c->dwarf.args_size = 0;
-  c->dwarf.ret_addr_column = RIP;
   c->dwarf.stash_frames = 0;
   c->dwarf.use_prev_instr = use_prev_instr;
   c->dwarf.pi_valid = 0;