Merge pull request #3613 from tautschnig/vs-local-variables

Remove unused local variables or fix code to use them [blocks: #2310]

Author: tautschnig

jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp

@@ -76,11 +76,11 @@ SCENARIO(
         reverse.type(),
         {{require_type::type_argument_kindt::Var, "java::KeyValue::V"},
          {require_type::type_argument_kindt::Var, "java::KeyValue::K"}});
-    REQUIRE(next_type.subtype().id() == ID_struct_tag);
+    REQUIRE(reverse_type.subtype().id() == ID_struct_tag);
     const struct_tag_typet &reverse_symbol =
       to_struct_tag_type(reverse_type.subtype());
     REQUIRE(
-      symbol_table.lookup_ref(next_symbol.get_identifier()).name ==
+      symbol_table.lookup_ref(reverse_symbol.get_identifier()).name ==
       "java::KeyValue");
   }
   WHEN("The class of type `MutuallyRecursiveGenerics` is created")

jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp

@@ -107,12 +107,6 @@ void validate_lambda_assignment(
     Catch::Matchers::Vector::ContainsElementMatcher<irep_idt>{
       tmp_class_identifier});
 
-  const java_class_typet::componentt super_class_component =
-    require_type::require_component(tmp_lambda_class_type, "@java.lang.Object");
-
-  const struct_tag_typet &super_class_type = require_type::require_struct_tag(
-    super_class_component.type(), "java::java.lang.Object");
-
   THEN("The function in the class should call the lambda method")
   {
     const irep_idt method_identifier =

jbmc/unit/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp

@@ -195,7 +195,6 @@ SCENARIO("instantiate_not_contains",
     string_constraint_generatort generator(ns);
     const auto pair = generator.add_axioms_for_function_application(
       generator.fresh_symbol, func);
-    const exprt &res = pair.first;
     const string_constraintst &constraints = pair.second;
 
     std::string axioms;

src/goto-programs/goto_inline_class.cpp

@@ -739,8 +739,6 @@ void goto_inlinet::output_inline_map(
     goto_functionst::function_mapt::const_iterator f_it=
       goto_functions.function_map.find(id);
 
-    std::string call="-";
-
     if(f_it!=goto_functions.function_map.end() &&
        !call_list.empty())
     {

unit/util/range.cpp

@@ -105,9 +105,8 @@ SCENARIO(
     THEN("A range of made from the vector can be filtered.")
     {
       auto odds_filter = make_range(input).filter(is_odd);
-      std::size_t total = 0;
-      for(const auto &move_only : odds_filter)
-        total += 1;
+      const std::size_t total =
+        std::distance(odds_filter.begin(), odds_filter.end());
       REQUIRE(total == 5);
       auto iterator = odds_filter.begin();
       REQUIRE((iterator++)->value == 1);