Use non-deprecated variant of to_integer

to_integer requires a constant_exprt as first argument.

Author: tautschnig

src/ansi-c/c_typecheck_expr.cpp

@@ -2592,7 +2592,7 @@ exprt c_typecheck_baset::do_special_functions(
       arg1=1;
     else if(expr.arguments()[1].is_false())
       arg1=0;
-    else if(to_integer(expr.arguments()[1], arg1))
+    else if(to_integer(to_constant_expr(expr.arguments()[1]), arg1))
     {
       error().source_location = f_op.source_location();
       error() << "__builtin_object_size expects constant as second argument, "

src/ansi-c/c_typecheck_initializer.cpp

@@ -726,7 +726,7 @@ designatort c_typecheck_baset::make_designator(
 
       mp_integer index, size;
 
-      if(to_integer(tmp_index, index))
+      if(to_integer(to_constant_expr(tmp_index), index))
       {
         error().source_location = d_op.op0().source_location();
         error() << "expected constant array index designator" << eom;

src/ansi-c/c_typecheck_type.cpp

@@ -316,7 +316,7 @@ void c_typecheck_baset::typecheck_custom_type(typet &type)
   make_constant_index(size_expr);
 
   mp_integer size_int;
-  if(to_integer(size_expr, size_int))
+  if(to_integer(to_constant_expr(size_expr), size_int))
   {
     error().source_location=source_location;
     error() << "failed to convert bit vector width to constant" << eom;
@@ -354,7 +354,7 @@ void c_typecheck_baset::typecheck_custom_type(typet &type)
     make_constant_index(f_expr);
 
     mp_integer f_int;
-    if(to_integer(f_expr, f_int))
+    if(to_integer(to_constant_expr(f_expr), f_int))
     {
       error().source_location = fraction_source_location;
       error() << "failed to convert number of fraction bits to constant" << eom;
@@ -386,7 +386,7 @@ void c_typecheck_baset::typecheck_custom_type(typet &type)
     make_constant_index(f_expr);
 
     mp_integer f_int;
-    if(to_integer(f_expr, f_int))
+    if(to_integer(to_constant_expr(f_expr), f_int))
     {
       error().source_location = fraction_source_location;
       error() << "failed to convert number of fraction bits to constant" << eom;
@@ -560,7 +560,7 @@ void c_typecheck_baset::typecheck_array_type(array_typet &type)
     if(tmp_size.is_constant())
     {
       mp_integer s;
-      if(to_integer(tmp_size, s))
+      if(to_integer(to_constant_expr(tmp_size), s))
       {
         error().source_location = size_source_location;
         error() << "failed to convert constant: "
@@ -684,7 +684,7 @@ void c_typecheck_baset::typecheck_vector_type(vector_typet &type)
   make_constant_index(size);
 
   mp_integer s;
-  if(to_integer(size, s))
+  if(to_integer(to_constant_expr(size), s))
   {
     error().source_location=source_location;
     error() << "failed to convert constant: "
@@ -1174,7 +1174,9 @@ void c_typecheck_baset::typecheck_c_enum_type(typet &type)
         value=1;
       else if(tmp_v.is_false())
         value=0;
-      else if(!to_integer(tmp_v, value))
+      else if(
+        tmp_v.id() == ID_constant &&
+        !to_integer(to_constant_expr(tmp_v), value))
       {
       }
       else
@@ -1384,7 +1386,7 @@ void c_typecheck_baset::typecheck_c_bit_field_type(c_bit_field_typet &type)
     typecheck_expr(width_expr);
     make_constant_index(width_expr);
 
-    if(to_integer(width_expr, i))
+    if(to_integer(to_constant_expr(width_expr), i))
     {
       error().source_location=type.source_location();
       error() << "failed to convert bit field width" << eom;

src/cpp/cpp_constructor.cpp

@@ -68,7 +68,7 @@ optionalt<codet> cpp_typecheckt::cpp_constructor(
     make_constant_index(tmp_size);
 
     mp_integer s;
-    if(to_integer(tmp_size, s))
+    if(to_integer(to_constant_expr(tmp_size), s))
     {
       error().source_location=source_location;
       error() << "array size `" << to_string(size_expr)

src/cpp/cpp_destructor.cpp

@@ -45,7 +45,7 @@ optionalt<codet> cpp_typecheckt::cpp_destructor(
     make_constant_index(tmp_size);
 
     mp_integer s;
-    if(to_integer(tmp_size, s))
+    if(to_integer(to_constant_expr(tmp_size), s))
     {
       error().source_location=source_location;
       error() << "array size `" << to_string(size_expr)

src/cpp/cpp_instantiate_template.cpp

@@ -63,7 +63,7 @@ std::string cpp_typecheckt::template_suffix(
         i=1;
       else if(e.is_false())
         i=0;
-      else if(to_integer(e, i))
+      else if(to_integer(to_constant_expr(e), i))
       {
         error().source_location = expr.find_source_location();
         error() << "template argument expression expected to be "

src/cpp/cpp_typecheck_compound_type.cpp

@@ -532,7 +532,7 @@ void cpp_typecheckt::typecheck_compound_declarator(
       if(value.is_not_nil() && value.id() == ID_constant)
       {
         mp_integer i;
-        to_integer(value, i);
+        to_integer(to_constant_expr(value), i);
         if(i!=0)
         {
           error().source_location = declarator.name().source_location();

src/cpp/cpp_typecheck_enum_type.cpp

@@ -40,7 +40,7 @@ void cpp_typecheckt::typecheck_enum_body(symbolt &enum_symbol)
       typecheck_expr(value);
       implicit_typecast(value, c_enum_type.subtype());
       make_constant(value);
-      if(to_integer(value, i))
+      if(to_integer(to_constant_expr(value), i))
       {
         error().source_location=value.find_source_location();
         error() << "failed to produce integer for enum constant" << eom;

src/goto-programs/builtin_functions.cpp

@@ -82,8 +82,9 @@ void goto_convertt::do_prob_uniform(
 
   mp_integer lb, ub;
 
-  if(to_integer(arguments[0], lb) ||
-     to_integer(arguments[1], ub))
+  if(
+    to_integer(to_constant_expr(arguments[0]), lb) ||
+    to_integer(to_constant_expr(arguments[1]), ub))
   {
     error().source_location=function.find_source_location();
     error() << "error converting operands" << eom;
@@ -147,10 +148,21 @@ void goto_convertt::do_prob_coin(
     throw 0;
   }
 
+  if(
+    arguments[1].type().id() != ID_unsignedbv ||
+    arguments[1].id() != ID_constant)
+  {
+    error().source_location = function.find_source_location();
+    error() << "`" << identifier << "' expected second operand to be "
+            << "a constant literal of type unsigned long" << eom;
+    throw 0;
+  }
+
   mp_integer num, den;
 
-  if(to_integer(arguments[0], num) ||
-     to_integer(arguments[1], den))
+  if(
+    to_integer(to_constant_expr(arguments[0]), num) ||
+    to_integer(to_constant_expr(arguments[1]), den))
   {
     error().source_location=function.find_source_location();
     error() << "error converting operands" << eom;

src/util/simplify_expr_int.cpp

@@ -1772,7 +1772,7 @@ bool simplify_exprt::simplify_inequality_constant(exprt &expr)
         if(it->is_constant())
         {
           mp_integer i;
-          if(!to_integer(*it, i))
+          if(!to_integer(to_constant_expr(*it), i))
           {
             constant+=i;
             *it=from_integer(0, it->type());