From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 7 Mar 2012 14:22:57 +0000 (+0100)
Subject: Fix kallsyms_expand_symbol.exp regression after commit 4d51e8.
X-Git-Tag: release-1.8~247
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=ea484b939860edee002f5c2b6db2c903ec1786b1;p=systemtap.git

Fix kallsyms_expand_symbol.exp regression after commit 4d51e8.

In dwflpp::find_variable_and_frame_base() when we do a search for a search
for an alternative vardie we need to saved the actual vardie content in
case we fail, no just copy the pointer to the vardie data...
---

diff --git a/dwflpp.cxx b/dwflpp.cxx
index ab4e6d5cc..c356f55a5 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -2157,7 +2157,7 @@ dwflpp::find_variable_and_frame_base (vector<Dwarf_Die>& scopes,
       && dwarf_attr_integrate (vardie, DW_AT_external, &attr_mem) != NULL
       && dwarf_tag(&scopes[declaring_scope]) == DW_TAG_compile_unit)
     {
-      Dwarf_Die *orig_vardie = vardie;
+      Dwarf_Die orig_vardie = *vardie;
       bool alt_found = false;
       if (dwarf_child(&scopes[declaring_scope], vardie) == 0)
 	do
@@ -2175,7 +2175,7 @@ dwflpp::find_variable_and_frame_base (vector<Dwarf_Die>& scopes,
 	while (!alt_found && dwarf_siblingof(vardie, vardie) == 0);
 
       if (! alt_found)
-	vardie = orig_vardie;
+	*vardie = orig_vardie;
     }
 
   /* We start out walking the "lexical scopes" as returned by