Merge branch 'mc' into mc-perf

diff --cc src/mc/mc_checkpoint.c
Simple merge

diff --cc src/mc/mc_compare.c
index 6918459,8d71ad4..40dd903
--- 1/src/mc/mc_compare.c
--- 2/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@@ -209,8 -209,8 +209,8 @@@ static int compare_areas_with_type(voi
        // The pointers are both in the heap:
        if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE){
          if(!(addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE))
-           xbt_die("Die");
+           return 1;
 -        return compare_heap_area(addr_pointed1, addr_pointed2, NULL, types, other_types, type->dw_type_id, pointer_level); 
 +        return compare_heap_area(addr_pointed1, addr_pointed2, NULL, info, other_info, type->dw_type_id, pointer_level);
        }
  
        // The pointers are both in the current object R/W segment:

diff --cc src/mc/mc_dwarf.c
Simple merge