From 4184bb478a11c0ceadc72bfc10dae174db8d30f3 Mon Sep 17 00:00:00 2001
From: Doug Moore <dougm@rice.edu>
Date: Mon, 8 May 2017 22:44:23 -0500
Subject: [PATCH] Restore a dwarf-free "apply_reg_state" function.

---
 src/dwarf/Gparser.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/dwarf/Gparser.c b/src/dwarf/Gparser.c
index 23ece95c..d7ed98a9 100644
--- a/src/dwarf/Gparser.c
+++ b/src/dwarf/Gparser.c
@@ -759,8 +759,8 @@ eval_location_expr (struct dwarf_cursor *c, unw_addr_space_t as,
   return 0;
 }
 
-HIDDEN int
-dwarf_apply_reg_state (struct dwarf_cursor *c, struct dwarf_reg_state *rs)
+static int
+apply_reg_state (struct dwarf_cursor *c, struct dwarf_reg_state *rs)
 {
   unw_word_t regnum, addr, cfa, ip;
   unw_word_t prev_ip, prev_cfa;
@@ -933,7 +933,7 @@ dwarf_step (struct dwarf_cursor *c)
   dwarf_state_record_t sr;
   if ((ret = find_reg_state (c, &sr)) < 0)
     return ret;
-  if ((ret = dwarf_apply_reg_state (c, &sr.rs_current)) < 0)
+  if ((ret = apply_reg_state (c, &sr.rs_current)) < 0)
     return ret;
 
   return 1;
@@ -1025,3 +1025,9 @@ dwarf_reg_states_iterate(struct dwarf_cursor *c,
   put_unwind_info (c, &c->pi);
   return ret;
 }
+
+HIDDEN int
+dwarf_apply_reg_state (struct dwarf_cursor *c, struct dwarf_reg_state *rs)
+{
+  return apply_reg_state(c, rs);
+}