[mc] Restore old behaviour when comparing pointers leading to different segments

Do not terminate the program but assume the state is different.

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 9543f09..8d71ad4 100644 (file)
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -209,14 +209,14 @@ static int compare_areas_with_type(void *area1, void *area2, xbt_dict_t types, x
       // 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))
       // 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); 
       }
 
       // The pointers are both in the current object R/W segment:
       else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size){
         if(!(addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size))
         return compare_heap_area(addr_pointed1, addr_pointed2, NULL, types, other_types, type->dw_type_id, pointer_level); 
       }
 
       // The pointers are both in the current object R/W segment:
       else if(addr_pointed1 > start_data && (char*)addr_pointed1 <= (char *)start_data + region_size){
         if(!(addr_pointed2 > start_data && (char*)addr_pointed2 <= (char *)start_data + region_size))

-          xbt_die("Die");
+          return 1;

         if(type->dw_type_id == NULL)
           return  (addr_pointed1 != addr_pointed2);
         else
         if(type->dw_type_id == NULL)
           return  (addr_pointed1 != addr_pointed2);
         else