Adapt to upstream CBMC changes

- MALLOC -> ALLOCATE
- java_new_array -> java_new_array_data

Author: smowton

cbmc/src/pointer-analysis/value_set.cpp

@@ -734,7 +734,7 @@ void value_sett::get_value_set_rec(
     }
     else if(statement==ID_cpp_new ||
             statement==ID_cpp_new_array ||
-            statement==ID_java_new_array )
+            statement==ID_java_new_array_data)
     {
       assert(suffix=="");
       assert(expr_type.id()==ID_pointer);

src/pointer-analysis/local_value_set.cpp

@@ -161,7 +161,7 @@ void local_value_sett::get_value_set_rec(
   else if(expr.id()==ID_side_effect)
   {
     const irep_idt &statement=expr.get(ID_statement);
-    if(statement==ID_malloc)
+    if(statement==ID_allocate)
     {
       // Override how malloc finds its type:
       exprt malloc_copy=expr;
@@ -235,7 +235,7 @@ void local_value_sett::apply_side_effects(
   const namespacet &ns)
 {
   if(rhs.id()==ID_side_effect &&
-    rhs.get(ID_statement)==ID_malloc)
+    rhs.get(ID_statement)==ID_allocate)
   {
     const typet &dynamic_type=
       static_cast<const typet &>(rhs.find(ID_C_cxx_alloc_type));

src/taint-analysis/taint_statistics.cpp

@@ -114,7 +114,7 @@ static bool  is_instruction_StringBuilder_call(
     if(asgn.rhs().id()==ID_side_effect)
     {
       side_effect_exprt const  see = to_side_effect_expr(asgn.rhs());
-      if(see.get_statement() == ID_malloc &&
+      if(see.get_statement() == ID_allocate &&
          does_irep_contains_ident(see.type(), "java::java.lang.StringBuilder"))
         return true;
     }
@@ -671,5 +671,3 @@ taint_statisticst::get_duration_of_all_phases_together() const
       ;
   return sum < 0.0001 ? 0.0001 : sum;
 }
-
-

src/taint-slicer/instrumenter.cpp

@@ -626,7 +626,7 @@ void taint_instrumentert::instrument_instructions_with_shadow_variables(
               props);
         }
         else if(asgn.rhs().id()==ID_side_effect &&
-          to_side_effect_expr(asgn.rhs()).get_statement()==ID_malloc)
+          to_side_effect_expr(asgn.rhs()).get_statement()==ID_allocate)
         {
           // TODO: Currently we handle here only allocations of single
           //       instances. Extension to array allocations will come later.