replace exprt::make_typecast() by typecast_exprt()

exprt::make_typecast() isn't type safe

Author: Daniel Kroening

src/pointer-analysis/value_set_fi.cpp

@@ -853,9 +853,13 @@ void value_set_fit::get_reference_set_sharing_rec(
         index_exprt index_expr(
           object, from_integer(0, index_type()), expr.type());
 
+        exprt casted_index;
+
         // adjust type?
         if(object.type().id() != "#REF#" && object.type() != array_type)
-          index_expr.make_typecast(array.type());
+          casted_index = typecast_exprt(index_expr, array.type());
+        else
+          casted_index = index_expr;
 
         offsett o = a_it->second;
         mp_integer i;
@@ -868,7 +872,7 @@ void value_set_fit::get_reference_set_sharing_rec(
         else
           o.reset();
 
-        insert(dest, index_expr, o);
+        insert(dest, casted_index, o);
       }
     }
 

src/pointer-analysis/value_set_fivr.cpp

@@ -964,9 +964,13 @@ void value_set_fivrt::get_reference_set_sharing_rec(
         index_exprt index_expr(
           object, from_integer(0, index_type()), expr.type());
 
+        exprt casted_index;
+
         // adjust type?
         if(object.type().id() != "#REF#" && object.type() != array_type)
-          index_expr.make_typecast(array.type());
+          casted_index = typecast_exprt(index_expr, array.type());
+        else
+          casted_index = index_expr;
 
         offsett o = a_it->second;
         mp_integer i;
@@ -979,7 +983,7 @@ void value_set_fivrt::get_reference_set_sharing_rec(
         else
           o.reset();
 
-        insert_from(dest, index_expr, o);
+        insert_from(dest, casted_index, o);
       }
     }
 

src/pointer-analysis/value_set_fivrns.cpp

@@ -657,9 +657,13 @@ void value_set_fivrnst::get_reference_set_rec(
         index_exprt index_expr(
           object, from_integer(0, index_type()), expr.type());
 
+        exprt casted_index;
+
         // adjust type?
-        if(object.type() != array_type)
-          index_expr.make_typecast(array.type());
+        if(object.type().id() != "#REF#" && object.type() != array_type)
+          casted_index = typecast_exprt(index_expr, array.type());
+        else
+          casted_index = index_expr;
 
         offsett o = a_it->second;
         mp_integer i;
@@ -672,7 +676,7 @@ void value_set_fivrnst::get_reference_set_rec(
         else
           o.reset();
 
-        insert_from(dest, index_expr, o);
+        insert_from(dest, casted_index, o);
       }
     }