From 01a26a51594f70d9e244fc7a29fb555f8a713b56 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 24 Mar 2014 13:08:04 +0100
Subject: [PATCH] [mc] Attach correct namespaced name in inlined subroutine
 (DW_TAG_inlined_subroutine)

---
 src/mc/mc_dwarf.c   | 46 ++++++++++++++++++++++++++++++++-------------
 src/mc/mc_global.c  | 11 +++++++++++
 src/mc/mc_private.h |  1 +
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/mc/mc_dwarf.c b/src/mc/mc_dwarf.c
index ba10efff73..d73e13fc25 100644
--- a/src/mc/mc_dwarf.c
+++ b/src/mc/mc_dwarf.c
@@ -273,23 +273,40 @@ static const char* MC_dwarf_at_linkage_name(Dwarf_Die* die) {
   return name;
 }
 
+static Dwarf_Off MC_dwarf_attr_dieoffset(Dwarf_Die* die, int attribute) {
+  Dwarf_Attribute attr;
+  if (dwarf_hasattr_integrate(die, attribute)) {
+    dwarf_attr_integrate(die, attribute, &attr);
+    Dwarf_Die subtype_die;
+    if (dwarf_formref_die(&attr, &subtype_die)==NULL) {
+      xbt_die("Could not find DIE");
+    }
+    return dwarf_dieoffset(&subtype_die);
+  }
+  else return 0;
+}
+
+static Dwarf_Off MC_dwarf_attr_integrate_dieoffset(Dwarf_Die* die, int attribute) {
+  Dwarf_Attribute attr;
+  if (dwarf_hasattr_integrate(die, attribute)) {
+    dwarf_attr_integrate(die, DW_AT_type, &attr);
+    Dwarf_Die subtype_die;
+    if (dwarf_formref_die(&attr, &subtype_die)==NULL) {
+      xbt_die("Could not find DIE");
+    }
+    return dwarf_dieoffset(&subtype_die);
+  }
+  else return 0;
+}
+
 /** \brief Find the type/subtype (DW_AT_type) for a DIE
  *
  *  \param dit the DIE
  *  \return DW_AT_type reference as a global offset in hexadecimal (or NULL)
  */
 static char* MC_dwarf_at_type(Dwarf_Die* die) {
-  Dwarf_Attribute attr;
-  if (dwarf_hasattr_integrate(die, DW_AT_type)) {
-	dwarf_attr_integrate(die, DW_AT_type, &attr);
-	Dwarf_Die subtype_die;
-	if (dwarf_formref_die(&attr, &subtype_die)==NULL) {
-	  xbt_die("Could not find DIE for type");
-	}
-	Dwarf_Off subtype_global_offset = dwarf_dieoffset(&subtype_die);
-    return bprintf("%" PRIx64 , subtype_global_offset);
-  }
-  else return NULL;
+  Dwarf_Off offset = MC_dwarf_attr_integrate_dieoffset(die, DW_AT_type);
+  return offset == 0 ? NULL : bprintf("%" PRIx64 , offset);
 }
 
 static uint64_t MC_dwarf_attr_integrate_addr(Dwarf_Die* die, int attribute) {
@@ -779,9 +796,12 @@ static void MC_dwarf_handle_scope_die(mc_object_info_t info, Dwarf_Die* die, Dwa
   frame->tag   = tag;
   frame->id = dwarf_dieoffset(die);
 
-  const char* name = MC_dwarf_attr_integrate_string(die, DW_AT_name);
-  if(name)
+  if(klass==mc_tag_subprogram) {
+    const char* name = MC_dwarf_attr_integrate_string(die, DW_AT_name);
     frame->name = namespace ? bprintf("%s::%s", namespace, name) : xbt_strdup(name);
+  }
+
+  frame->abstract_origin_id = MC_dwarf_attr_dieoffset(die, DW_AT_abstract_origin);
 
   // This is the base address for DWARF addresses.
   // Relocated addresses are offset from this base address.
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index efe1ef5245..17b7634454 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -306,6 +306,17 @@ static void MC_post_process_variables(mc_object_info_t info) {
 
 static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) {
 
+  if(scope->tag == DW_TAG_inlined_subroutine) {
+
+    // Attach correct namespaced name in inlined subroutine:
+    char* key = bprintf("%" PRIx64, (uint64_t) scope->abstract_origin_id);
+    dw_frame_t abstract_origin = xbt_dict_get_or_null(info->subprograms, key);
+    xbt_assert(abstract_origin, "Could not lookup abstract origin %s", key);
+    xbt_free(key);
+    scope->name = xbt_strdup(abstract_origin->name);
+
+  }
+
   // Direct:
   unsigned cursor = 0;
   dw_variable_t variable = NULL;
diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index cbf1f35e83..2ae91410fd 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -474,6 +474,7 @@ struct s_dw_frame{
   xbt_dynar_t /* <dw_variable_t> */ variables; /* Cannot use dict, there may be several variables with the same name (in different lexical blocks)*/
   unsigned long int id; /* DWARF offset of the subprogram */
   xbt_dynar_t /* <dw_frame_t> */ scopes;
+  Dwarf_Off abstract_origin_id;
 };
 
 struct s_mc_function_index_item {
-- 
2.20.1