Disambiguate overloaded insert(...) calls

Once we move to std::optional, the use of int results in an ambiguous
overload resolution. Avoid that by explicitly constructing an
mp_integer.

Author: tautschnig

src/pointer-analysis/value_set.cpp

@@ -564,7 +564,9 @@ void value_sett::get_value_set_rec(
     if(is_null_pointer(to_constant_expr(expr)))
     {
       insert(
-        dest, exprt(ID_null_object, to_pointer_type(expr_type).base_type()), 0);
+        dest,
+        exprt(ID_null_object, to_pointer_type(expr_type).base_type()),
+        mp_integer{0});
     }
     else if(expr_type.id()==ID_unsignedbv ||
             expr_type.id()==ID_signedbv)
@@ -593,7 +595,7 @@ void value_sett::get_value_set_rec(
       // integer-to-pointer
 
       if(op.is_zero())
-        insert(dest, exprt(ID_null_object, expr_type.subtype()), 0);
+        insert(dest, exprt(ID_null_object, expr_type.subtype()), mp_integer{0});
       else
       {
         // see if we have something for the integer
@@ -778,7 +780,7 @@ void value_sett::get_value_set_rec(
       dynamic_object.set_instance(location_number);
       dynamic_object.valid()=true_exprt();
 
-      insert(dest, dynamic_object, 0);
+      insert(dest, dynamic_object, mp_integer{0});
     }
     else if(statement==ID_cpp_new ||
             statement==ID_cpp_new_array)
@@ -791,7 +793,7 @@ void value_sett::get_value_set_rec(
       dynamic_object.set_instance(location_number);
       dynamic_object.valid()=true_exprt();
 
-      insert(dest, dynamic_object, 0);
+      insert(dest, dynamic_object, mp_integer{0});
     }
     else
       insert(dest, exprt(ID_unknown, original_type));
@@ -1092,7 +1094,7 @@ void value_sett::get_reference_set_rec(
       to_array_type(expr.type()).element_type().id() == ID_array)
       insert(dest, expr);
     else
-      insert(dest, expr, 0);
+      insert(dest, expr, mp_integer{0});
 
     return;
   }

src/pointer-analysis/value_set_fi.cpp

@@ -181,7 +181,7 @@ void value_set_fit::flatten_rec(
       {
         // this is some static object, keep it in.
         const symbol_exprt se(o.get(ID_identifier), o.type().subtype());
-        insert(dest, se, 0);
+        insert(dest, se, mp_integer{0});
       }
       else
       {
@@ -461,15 +461,15 @@ void value_set_fit::get_value_set_rec(
 
     if(has_prefix(id2string(ident), alloc_adapter_prefix))
     {
-      insert(dest, expr, 0);
+      insert(dest, expr, mp_integer{0});
       return;
     }
     else if(v_it!=values.end())
     {
       typet t("#REF#");
       t.subtype() = expr.type();
       symbol_exprt sym(ident, t);
-      insert(dest, sym, 0);
+      insert(dest, sym, mp_integer{0});
       return;
     }
   }
@@ -521,7 +521,7 @@ void value_set_fit::get_value_set_rec(
     // check if NULL
     if(is_null_pointer(to_constant_expr(expr)))
     {
-      insert(dest, exprt(ID_null_object, expr.type().subtype()), 0);
+      insert(dest, exprt(ID_null_object, expr.type().subtype()), mp_integer{0});
       return;
     }
   }
@@ -620,7 +620,7 @@ void value_set_fit::get_value_set_rec(
         (from_function << 16) | from_target_index);
       dynamic_object.valid()=true_exprt();
 
-      insert(dest, dynamic_object, 0);
+      insert(dest, dynamic_object, mp_integer{0});
       return;
     }
     else if(statement==ID_cpp_new ||
@@ -634,14 +634,14 @@ void value_set_fit::get_value_set_rec(
         (from_function << 16) | from_target_index);
       dynamic_object.valid()=true_exprt();
 
-      insert(dest, dynamic_object, 0);
+      insert(dest, dynamic_object, mp_integer{0});
       return;
     }
   }
   else if(expr.id()==ID_struct)
   {
     // this is like a static struct object
-    insert(dest, address_of_exprt(expr), 0);
+    insert(dest, address_of_exprt(expr), mp_integer{0});
     return;
   }
   else if(expr.id()==ID_with)
@@ -785,7 +785,7 @@ void value_set_fit::get_reference_set_sharing_rec(
        expr.type().subtype().id()==ID_array)
       insert(dest, expr);
     else
-      insert(dest, expr, 0);
+      insert(dest, expr, mp_integer{0});
 
     return;
   }