From 5c628c87e93357849fdcfa2433c42a60733f4362 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 7 Jan 2014 10:33:11 +0100
Subject: [PATCH] [mc] Remove type DW_TAG_enumerator type (because it is not a
 type)

---
 src/include/mc/datatypes.h |  1 -
 src/mc/mc_global.c         | 17 +++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index 6fe65fd27a..7802ec1e2d 100644
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -42,7 +42,6 @@ void heap_ignore_region_free_voidp(void *r);
 typedef enum{
   e_dw_base_type = 0,
   e_dw_enumeration_type,
-  e_dw_enumerator,
   e_dw_typedef,
   e_dw_const_type,
   e_dw_array_type,
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 2471803f3e..07c7800b49 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -920,7 +920,6 @@ void MC_dwarf_get_variables(mc_object_info_t info) {
 
     }else if(strcmp(node_type, "(DW_TAG_base_type)") == 0 
              || strcmp(node_type, "(DW_TAG_enumeration_type)") == 0
-             || strcmp(node_type, "(DW_TAG_enumerator)") == 0
              || strcmp(node_type, "(DW_TAG_typedef)") == 0
              || strcmp(node_type, "(DW_TAG_const_type)") == 0
              || strcmp(node_type, "(DW_TAG_subroutine_type)") == 0
@@ -933,8 +932,6 @@ void MC_dwarf_get_variables(mc_object_info_t info) {
         type_type = e_dw_base_type;
       else if(strcmp(node_type, "(DW_TAG_enumeration_type)") == 0)
         type_type = e_dw_enumeration_type;
-      else if(strcmp(node_type, "(DW_TAG_enumerator)") == 0)
-        type_type = e_dw_enumerator;
       else if(strcmp(node_type, "(DW_TAG_typedef)") == 0)
         type_type = e_dw_typedef;
       else if(strcmp(node_type, "(DW_TAG_const_type)") == 0)
@@ -1001,15 +998,11 @@ void MC_dwarf_get_variables(mc_object_info_t info) {
       type->id = (void *)strtoul(origin, NULL, 16);
       if(type_origin)
         type->dw_type_id = xbt_strdup(type_origin);
-      if(type_type == e_dw_enumerator) {
-        type->element_count = enumeration_size;
-        type->byte_size = size;
-      }
-      else {
-        type->byte_size = size;
-        // Not relevant:
-        type->element_count = -1;
-      }
+
+      type->byte_size = size;
+      // Not relevant:
+      type->element_count = -1;
+
       type->members = NULL;
 
       xbt_dict_set(*types, origin, type, NULL); 
-- 
2.20.1