Merge branch mc into mc-perf

[simgrid.git] / src / mc / mc_hash.c

diff --git a/src/mc/mc_hash.c b/src/mc/mc_hash.c
index 5bba2ff..4f74676 100644 (file)
--- a/src/mc/mc_hash.c
+++ b/src/mc/mc_hash.c
@@ -203,13 +203,13 @@ static void mc_hash_object_globals(mc_hash_t *hash, mc_hashing_state* state, mc_
       continue;
     }
 
-    const char* address = variable->address.address;
+    const char* address = variable->address;
     bool valid_pointer = (address >= mc_binary_info->start_rw && address <= mc_binary_info->end_rw)
         || (address >= mc_libsimgrid_info->start_rw && address <= mc_libsimgrid_info->end_rw)
         || (address >= (const char*) std_heap && address < (const char *)std_heap + STD_HEAP_SIZE);
     if(!valid_pointer) continue;
 
-    mc_hash_value(hash, state, info, variable->address.address, type);
+    mc_hash_value(hash, state, info, variable->address, type);
   }
 }
 
@@ -228,14 +228,14 @@ static void mc_hash_stack_frame(
       XBT_DEBUG("Hash local variable %s without type", variable->name);
       continue;
     }
-    if(variable->address.location == NULL) {
+    if(variable->location == NULL) {
       XBT_DEBUG("Hash local variable %s without location", variable->name);
       continue;
     }
 
     XBT_DEBUG("Hash local variable %s", variable->name);
 
-    void* variable_address = (void*) MC_dwarf_resolve_location(unw_cursor, variable->address.location, frame_pointer);
+    void* variable_address = (void*) MC_dwarf_resolve_location(unw_cursor, variable->location, frame_pointer);
 
     dw_type_t type = xbt_dict_get_or_null(info->types, variable->type_origin);
     if(type==NULL) {