Merge pull request #3668 from tautschnig/vs-remove-unused-vars

Remove unused variables [blocks: #2310]

Author: Daniel Kroening

jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp

@@ -32,9 +32,8 @@ SCENARIO(
     THEN("The symbol type should be generic")
     {
       const symbolt &class_symbol = new_symbol_table.lookup_ref(inner_name);
-      const java_generic_class_typet &java_generic_class_type =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type, {inner_name + "::E"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type, {inner_name + "::E"});
 
       THEN("The fields are of correct types")
       {
@@ -55,9 +54,8 @@ SCENARIO(
     {
       const symbolt &class_symbol =
         new_symbol_table.lookup_ref(boundedinner_name);
-      const java_generic_class_typet &java_generic_class_type =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type, {boundedinner_name + "::NUM"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type, {boundedinner_name + "::NUM"});
 
       // TODO extend when bounds are parsed correctly - TG-1286
 
@@ -138,10 +136,9 @@ SCENARIO(
     {
       const symbolt &class_symbol =
         new_symbol_table.lookup_ref(twoelementinner_name);
-      const java_generic_class_typet &java_generic_class_type =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type,
-          {twoelementinner_name + "::K", twoelementinner_name + "::V"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type,
+        {twoelementinner_name + "::K", twoelementinner_name + "::V"});
 
       // TODO extend when bounds are parsed correctly - TG-1286
 

jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp

@@ -26,9 +26,8 @@ SCENARIO(
       REQUIRE(new_symbol_table.has_symbol(class_prefix));
 
       const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
-      const java_generic_class_typet &java_generic_class =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type, {class_prefix + "::T"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type, {class_prefix + "::T"});
 
       const struct_typet class_struct = to_struct_type(class_symbol.type);
       THEN("It has field t")
@@ -78,9 +77,8 @@ SCENARIO(
       REQUIRE(new_symbol_table.has_symbol(class_prefix));
 
       const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
-      const java_generic_class_typet &java_generic_class =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type, {class_prefix + "::T", class_prefix + "::U"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type, {class_prefix + "::T", class_prefix + "::U"});
 
       const struct_typet class_struct = to_struct_type(class_symbol.type);
       THEN("It has field t")

jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp

@@ -26,9 +26,8 @@ SCENARIO(
       REQUIRE(new_symbol_table.has_symbol(class_prefix));
 
       const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
-      const java_generic_class_typet &java_generic_class_type =
-        require_type::require_complete_java_generic_class(
-          class_symbol.type, {class_prefix + "::T", class_prefix + "::S"});
+      require_type::require_complete_java_generic_class(
+        class_symbol.type, {class_prefix + "::T", class_prefix + "::S"});
 
       const struct_typet class_struct = to_struct_type(class_symbol.type);
 

jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp

@@ -27,9 +27,8 @@ SCENARIO(
     REQUIRE(new_symbol_table.has_symbol(inner_prefix));
 
     const symbolt &inner_symbol = new_symbol_table.lookup_ref(inner_prefix);
-    const class_typet &inner_class_type =
-      require_type::require_complete_java_implicitly_generic_class(
-        inner_symbol.type);
+    require_type::require_complete_java_implicitly_generic_class(
+      inner_symbol.type);
   }
 
   THEN(