add missing const qualifiers

This prevents accidental disruption of sharing.

Author: Daniel Kroening

jbmc/src/java_bytecode/remove_exceptions.cpp

@@ -434,7 +434,8 @@ bool remove_exceptionst::instrument_function_call(
   goto_programt::targett next_it=instr_it;
   next_it++;
 
-  code_function_callt &function_call = instr_it->get_function_call();
+  const code_function_callt &function_call = instr_it->get_function_call();
+
   DATA_INVARIANT(
     function_call.function().id()==ID_symbol,
     "identified expected to be a symbol");

src/goto-instrument/accelerate/accelerate.cpp

@@ -380,7 +380,7 @@ void acceleratet::add_dirty_checks()
     // variables is clean _before_ clearing any dirty flags.
     if(it->is_assign())
     {
-      exprt &lhs = it->get_assign().lhs();
+      const exprt &lhs = it->get_assign().lhs();
       expr_mapt::iterator dirty_var=dirty_vars_map.find(lhs);
 
       if(dirty_var!=dirty_vars_map.end())

src/goto-programs/parameter_assignments.cpp

@@ -42,7 +42,7 @@ void parameter_assignmentst::do_function_calls(
   {
     if(i_it->is_function_call())
     {
-      code_function_callt &function_call = i_it->get_function_call();
+      const code_function_callt &function_call = i_it->get_function_call();
 
       // add x=y for f(y) where x is the parameter
 

src/goto-programs/string_abstraction.cpp

@@ -1046,13 +1046,13 @@ void string_abstractiont::move_lhs_arithmetic(exprt &lhs, exprt &rhs)
 
 goto_programt::targett string_abstractiont::abstract_pointer_assign(
   goto_programt &dest,
-  goto_programt::targett target)
+  const goto_programt::targett target)
 {
-  code_assignt &assign = target->get_assign();
+  const code_assignt &assign = target->get_assign();
 
-  exprt &lhs=assign.lhs();
-  exprt rhs=assign.rhs();
-  exprt *rhsp=&(assign.rhs());
+  const exprt &lhs = assign.lhs();
+  const exprt rhs = assign.rhs();
+  const exprt *rhsp = &(assign.rhs());
 
   while(rhsp->id()==ID_typecast)
     rhsp=&(rhsp->op0());
@@ -1077,9 +1077,8 @@ goto_programt::targett string_abstractiont::abstract_pointer_assign(
       code_assignt(new_lhs, new_rhs), target->source_location);
     assignment.code.add_source_location()=target->source_location;
     dest.insert_before_swap(target, assignment);
-    ++target;
 
-    return target;
+    return std::next(target);
   }
   else
   {
@@ -1091,10 +1090,10 @@ goto_programt::targett string_abstractiont::abstract_char_assign(
   goto_programt &dest,
   goto_programt::targett target)
 {
-  code_assignt &assign = target->get_assign();
+  const code_assignt &assign = target->get_assign();
 
-  exprt &lhs=assign.lhs();
-  exprt *rhsp=&(assign.rhs());
+  const exprt &lhs = assign.lhs();
+  const exprt *rhsp = &(assign.rhs());
 
   while(rhsp->id()==ID_typecast)
     rhsp=&(rhsp->op0());

src/goto-programs/string_instrumentation.cpp

@@ -84,43 +84,43 @@ class string_instrumentationt:public messaget
   void do_sprintf(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_snprintf(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strcat(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strncmp(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strchr(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strrchr(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strstr(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strtok(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_strerror(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
   void do_fscanf(
     goto_programt &dest,
     goto_programt::targett it,
-    code_function_callt &call);
+    const code_function_callt &);
 
   void do_format_string_read(
     goto_programt &dest,
@@ -222,8 +222,8 @@ void string_instrumentationt::do_function_call(
   goto_programt &dest,
   goto_programt::targett target)
 {
-  code_function_callt &call = target->get_function_call();
-  exprt &function=call.function();
+  const code_function_callt &call = target->get_function_call();
+  const exprt &function = call.function();
   // const exprt &lhs=call.lhs();
 
   if(function.id()==ID_symbol)
@@ -272,7 +272,7 @@ void string_instrumentationt::do_function_call(
 void string_instrumentationt::do_sprintf(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -312,7 +312,7 @@ void string_instrumentationt::do_sprintf(
 void string_instrumentationt::do_snprintf(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -353,7 +353,7 @@ void string_instrumentationt::do_snprintf(
 void string_instrumentationt::do_fscanf(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -618,14 +618,14 @@ void string_instrumentationt::do_format_string_write(
 void string_instrumentationt::do_strncmp(
   goto_programt &,
   goto_programt::targett,
-  code_function_callt &)
+  const code_function_callt &)
 {
 }
 
 void string_instrumentationt::do_strchr(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -650,7 +650,7 @@ void string_instrumentationt::do_strchr(
 void string_instrumentationt::do_strrchr(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -675,7 +675,7 @@ void string_instrumentationt::do_strrchr(
 void string_instrumentationt::do_strstr(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -706,7 +706,7 @@ void string_instrumentationt::do_strstr(
 void string_instrumentationt::do_strtok(
   goto_programt &dest,
   goto_programt::targett target,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   const code_function_callt::argumentst &arguments=call.arguments();
 
@@ -737,7 +737,7 @@ void string_instrumentationt::do_strtok(
 void string_instrumentationt::do_strerror(
   goto_programt &dest,
   goto_programt::targett it,
-  code_function_callt &call)
+  const code_function_callt &call)
 {
   if(call.lhs().is_nil())
   {