From e5c209cfab832004863f873fc8120b96366357e1 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Thu, 30 Jun 2016 12:08:07 -0400
Subject: [PATCH] PR20307: fix references to private global in tapset

Previous code could not resolve a reference to a private global
(defined in a tapset) within a probe alias (from that same tapset).
We now try matching up the mangled name in addition to the plain one
in symresolution_info::find_var() when searching the
session.library_files[].globals.
---
 elaborate.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elaborate.cxx b/elaborate.cxx
index 4a375d980..740e30c4b 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -2732,7 +2732,8 @@ symresolution_info::find_var (interned_string name, int arity, const token* tok)
       for (unsigned j=0; j<f->globals.size(); j++)
         {
           vardecl* g = f->globals[j];
-          if (g->name == gname)
+          if ((g->name == gname) ||
+              (g->name == pname)) // private global within tapset
             {
 	      g->set_arity (arity, tok);
 
-- 
2.43.5