Merge pull request #6542 from tautschnig/is_constant

Consistently use exprt::is_constant()

Author: kroening

jbmc/src/java_bytecode/expr2java.cpp

@@ -427,7 +427,7 @@ std::string expr2javat::convert_with_precedence(
   {
     return '"' + MetaString(id2string(literal->value())) + '"';
   }
-  else if(src.id()==ID_constant)
+  else if(src.is_constant())
     return convert_constant(to_constant_expr(src), precedence=16);
   else
     return expr2ct::convert_with_precedence(src, precedence);

jbmc/src/java_bytecode/java_bytecode_convert_method.cpp

@@ -1447,8 +1447,7 @@ java_bytecode_convert_methodt::convert_instructions(const methodt &method)
     {
       CHECK_RETURN(results.size() == 1);
       DATA_INVARIANT(
-        arg0.id()==ID_constant,
-        "ipush argument expected to be constant");
+        arg0.is_constant(), "ipush argument expected to be constant");
       results[0] = typecast_exprt::conditional_cast(arg0, java_int_type());
     }
     else if(bytecode == patternt("if_?cmp??"))

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -581,7 +581,7 @@ static exprt get_ldc_result(
   else
   {
     INVARIANT(
-      ldc_arg0.id() == ID_constant,
+      ldc_arg0.is_constant(),
       "ldc argument should be constant, string literal or class literal");
     return ldc_arg0;
   }

jbmc/src/java_bytecode/java_trace_validation.cpp

@@ -104,19 +104,15 @@ bool check_struct_structure(const struct_exprt &expr)
   {
     return false;
   }
-  if(
-    expr.operands().size() > 1 && std::any_of(
-                                    ++expr.operands().begin(),
-                                    expr.operands().end(),
-                                    [&](const exprt &operand) {
-                                      return operand.id() != ID_constant &&
-                                             operand.id() !=
-                                               ID_annotated_pointer_constant;
-                                    }))
-  {
-    return false;
-  }
-  return true;
+
+  return expr.operands().size() == 1 ||
+         std::all_of(
+           std::next(expr.operands().begin()),
+           expr.operands().end(),
+           [&](const exprt &operand) {
+             return can_cast_expr<constant_exprt>(operand) ||
+                    can_cast_expr<annotated_pointer_constant_exprt>(operand);
+           });
 }
 
 bool check_address_structure(const address_of_exprt &address)

jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp

@@ -33,9 +33,7 @@ exprt resolve_classid_test(
 
   const auto &expr_binary = to_binary_expr(expr);
 
-  if(
-    expr_binary.op0().id() == ID_constant &&
-    expr_binary.op1().id() != ID_constant)
+  if(expr_binary.op0().is_constant() && !expr_binary.op1().is_constant())
   {
     binary_exprt swapped = expr_binary;
     std::swap(swapped.op0(), swapped.op1());
@@ -46,7 +44,7 @@ exprt resolve_classid_test(
     expr_binary.op0().id() == ID_member &&
     to_member_expr(expr_binary.op0()).get_component_name() ==
       "@class_identifier" &&
-    expr_binary.op1().id() == ID_constant &&
+    expr_binary.op1().is_constant() &&
     expr_binary.op1().type().id() == ID_string)
   {
     binary_exprt resolved = expr_binary;

jbmc/unit/java_bytecode/java_virtual_functions/virtual_functions.cpp

@@ -22,7 +22,7 @@ void check_function_call(
   const irep_idt &function_name,
   const goto_programt::targetst &targets)
 {
-  REQUIRE(eq_expr.op0().id() == ID_constant);
+  REQUIRE(eq_expr.op0().is_constant());
   REQUIRE(eq_expr.op0().type().id() == ID_string);
   REQUIRE(to_constant_expr(eq_expr.op0()).get_value() == class_name);
 
@@ -99,8 +99,9 @@ SCENARIO(
                   equal_exprt eq_expr1 =
                     to_equal_expr(disjunction.op1());
 
-                  if(eq_expr0.op0().id() == ID_constant &&
-                     to_constant_expr(eq_expr0.op0()).get_value() == "java::O")
+                  if(
+                    eq_expr0.op0().is_constant() &&
+                    to_constant_expr(eq_expr0.op0()).get_value() == "java::O")
                   {
                     // Allow either order of the D and O comparisons:
                     std::swap(eq_expr0, eq_expr1);

src/analyses/constant_propagator.cpp

@@ -777,7 +777,7 @@ void constant_propagator_ait::replace(
 
       if(!constant_propagator_domaint::partial_evaluate(d.values, rhs, ns))
       {
-        if(rhs.id() == ID_constant)
+        if(rhs.is_constant())
           rhs.add_source_location() = it->assign_lhs().source_location();
       }
     }

src/analyses/interval_domain.cpp

@@ -272,7 +272,7 @@ void interval_domaint::assume_rec(
             << from_expr(rhs) << "\n";
   #endif
 
-  if(lhs.id()==ID_symbol && rhs.id()==ID_constant)
+  if(lhs.id() == ID_symbol && rhs.is_constant())
   {
     irep_idt lhs_identifier=to_symbol_expr(lhs).get_identifier();
 
@@ -297,7 +297,7 @@ void interval_domaint::assume_rec(
         make_bottom();
     }
   }
-  else if(lhs.id()==ID_constant && rhs.id()==ID_symbol)
+  else if(lhs.is_constant() && rhs.id() == ID_symbol)
   {
     irep_idt rhs_identifier=to_symbol_expr(rhs).get_identifier();
 

src/analyses/local_bitvector_analysis.cpp

@@ -113,7 +113,7 @@ local_bitvector_analysist::flagst local_bitvector_analysist::get_rec(
   const exprt &rhs,
   points_tot &loc_info_src)
 {
-  if(rhs.id()==ID_constant)
+  if(rhs.is_constant())
   {
     if(rhs.is_zero())
       return flagst::mk_null();

src/analyses/local_may_alias.cpp

@@ -169,7 +169,7 @@ void local_may_aliast::get_rec(
   const exprt &rhs,
   const loc_infot &loc_info_src) const
 {
-  if(rhs.id()==ID_constant)
+  if(rhs.is_constant())
   {
     if(rhs.is_zero())
       dest.insert(objects.number(exprt(ID_null_object)));