Merge pull request #3677 from tautschnig/vs-shadow-goto-programs

Avoid shadowing in directory goto-programs [blocks: #2310]

Author: tautschnig

src/goto-programs/goto_inline.cpp

@@ -55,9 +55,9 @@ void goto_inline(
   if(it==goto_functions.function_map.end())
     return;
 
-  goto_functiont &goto_function=it->second;
+  goto_functiont &entry_function = it->second;
   DATA_INVARIANT(
-    goto_function.body_available(),
+    entry_function.body_available(),
     "body of entry point function must be available");
 
   // gather all calls
@@ -86,7 +86,7 @@ void goto_inline(
   }
 
   goto_inline.goto_inline(
-    goto_functionst::entry_point(), goto_function, inline_map, true);
+    goto_functionst::entry_point(), entry_function, inline_map, true);
 
   // clean up
   Forall_goto_functions(f_it, goto_functions)
@@ -180,24 +180,23 @@ void goto_partial_inline(
       const symbol_exprt &symbol_expr=to_symbol_expr(function_expr);
       const irep_idt id=symbol_expr.get_identifier();
 
-      goto_functionst::function_mapt::const_iterator f_it=
+      goto_functionst::function_mapt::const_iterator called_it =
         goto_functions.function_map.find(id);
 
-      if(f_it==goto_functions.function_map.end())
+      if(called_it == goto_functions.function_map.end())
         // Function not loaded, can't check size
         continue;
 
       // called function
-      const goto_functiont &goto_function=f_it->second;
+      const goto_functiont &called_function = called_it->second;
 
-      if(!goto_function.body_available())
+      if(!called_function.body_available())
         // The bodies of functions that don't have bodies can't be inlined.
         continue;
 
-      const goto_programt &goto_program=goto_function.body;
-
-      if(goto_function.is_inlined() ||
-         goto_program.instructions.size()<=smallfunc_limit)
+      if(
+        called_function.is_inlined() ||
+        called_function.body.instructions.size() <= smallfunc_limit)
       {
         PRECONDITION(i_it->is_function_call());
 

src/goto-programs/instrument_preconditions.cpp

@@ -78,11 +78,9 @@ replace_symbolt actuals_replace_map(
     if(p.get_identifier()!=irep_idt() &&
        arguments.size()>count)
     {
-      exprt a=arguments[count];
-      if(a.type()!=p.type())
-        a=typecast_exprt(a, p.type());
-      symbol_exprt s(p.get_identifier(), p.type());
-      result.insert(s, a);
+      const exprt a =
+        typecast_exprt::conditional_cast(arguments[count], p.type());
+      result.insert(symbol_exprt(p.get_identifier(), p.type()), a);
     }
     count++;
   }

src/goto-programs/interpreter.cpp

@@ -611,21 +611,22 @@ exprt interpretert::get_value(
       // We want the symbol pointed to
       mp_integer address = rhs[numeric_cast_v<std::size_t>(offset)];
       irep_idt identifier=address_to_identifier(address);
-      mp_integer offset=address_to_offset(address);
-      const typet type=get_type(identifier);
-      const symbol_exprt symbol_expr(identifier, type);
+      mp_integer offset_from_address = address_to_offset(address);
+      const typet type_from_identifier = get_type(identifier);
+      const symbol_exprt symbol_expr(identifier, type_from_identifier);
 
-      if(offset==0)
+      if(offset_from_address == 0)
         return address_of_exprt(symbol_expr);
 
-      if(ns.follow(type).id()==ID_struct)
+      if(ns.follow(type_from_identifier).id() == ID_struct)
       {
-        const auto c=get_component(identifier, offset);
+        const auto c = get_component(identifier, offset_from_address);
         member_exprt member_expr(symbol_expr, c);
         return address_of_exprt(member_expr);
       }
 
-      return index_exprt(symbol_expr, from_integer(offset, integer_typet()));
+      return index_exprt(
+        symbol_expr, from_integer(offset_from_address, integer_typet()));
     }
 
     error() << "interpreter: invalid pointer "

src/goto-programs/json_goto_trace.cpp

@@ -138,9 +138,9 @@ void convert_decl(
       type_string = from_type(ns, identifier, symbol->type);
 
     json_assignment["mode"] = json_stringt(symbol->mode);
-    exprt simplified = simplify_expr(step.full_lhs_value, ns);
+    const exprt simplified_expr = simplify_expr(step.full_lhs_value, ns);
 
-    full_lhs_value = json(simplified, ns, symbol->mode);
+    full_lhs_value = json(simplified_expr, ns, symbol->mode);
   }
   else
   {

src/goto-programs/replace_calls.cpp

@@ -103,13 +103,12 @@ void replace_callst::operator()(
       const code_assignt &ca = to_code_assign(next_it->code);
       const exprt &rhs = ca.rhs();
 
-      if(rhs.id() == ID_symbol)
-      {
-        const symbol_exprt &se = to_symbol_expr(rhs);
-        INVARIANT(
-          !has_suffix(id2string(se.get_identifier()), RETURN_VALUE_SUFFIX),
-          "returns must not be removed before replacing calls");
-      }
+      INVARIANT(
+        rhs.id() != ID_symbol ||
+          !has_suffix(
+            id2string(to_symbol_expr(rhs).get_identifier()),
+            RETURN_VALUE_SUFFIX),
+        "returns must not be removed before replacing calls");
     }
 
     // Finally modify the call

src/goto-programs/string_instrumentation.cpp

@@ -453,9 +453,8 @@ void string_instrumentationt::do_format_string_read(
     format_ass->make_assertion(is_zero_string(arguments[1]));
     format_ass->source_location=target->source_location;
     format_ass->source_location.set_property_class("string");
-    std::string comment("zero-termination of format string of ");
-    comment += function_name;
-    format_ass->source_location.set_comment(comment);
+    format_ass->source_location.set_comment(
+      "zero-termination of format string of " + function_name);
 
     for(std::size_t i=2; i<arguments.size(); i++)
     {
@@ -468,9 +467,8 @@ void string_instrumentationt::do_format_string_read(
         goto_programt::targett assertion=dest.add_instruction();
         assertion->source_location=target->source_location;
         assertion->source_location.set_property_class("string");
-        std::string comment("zero-termination of string argument of ");
-        comment += function_name;
-        assertion->source_location.set_comment(comment);
+        assertion->source_location.set_comment(
+          "zero-termination of string argument of " + function_name);
 
         exprt temp(arg);