Merge pull request #2470 from tautschnig/vs-void-par

Silence warnings about unused parameters [blocks: #2310]

Author: tautschnig

jbmc/src/java_bytecode/character_refine_preprocess.cpp

@@ -338,6 +338,7 @@ codet character_refine_preprocesst::convert_high_surrogate(
 exprt character_refine_preprocesst::expr_of_is_ascii_lower_case(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return in_interval_expr(chr, 'a', 'z');
 }
 
@@ -348,6 +349,7 @@ exprt character_refine_preprocesst::expr_of_is_ascii_lower_case(
 exprt character_refine_preprocesst::expr_of_is_ascii_upper_case(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return in_interval_expr(chr, 'A', 'Z');
 }
 
@@ -402,6 +404,7 @@ codet character_refine_preprocesst::convert_is_alphabetic(
 exprt character_refine_preprocesst::expr_of_is_bmp_code_point(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return and_exprt(
     binary_relation_exprt(chr, ID_le, from_integer(0xFFFF, chr.type())),
     binary_relation_exprt(chr, ID_ge, from_integer(0, chr.type())));
@@ -424,6 +427,7 @@ codet character_refine_preprocesst::convert_is_bmp_code_point(
 exprt character_refine_preprocesst::expr_of_is_defined(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   // The following intervals are undefined in unicode, according to
   // the Unicode Character Database: http://www.unicode.org/Public/UCD/latest/
   exprt::operandst intervals;
@@ -488,6 +492,7 @@ codet character_refine_preprocesst::convert_is_defined_int(
 exprt character_refine_preprocesst::expr_of_is_digit(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   exprt latin_digit=in_interval_expr(chr, '0', '9');
   exprt arabic_indic_digit=in_interval_expr(chr, 0x660, 0x669);
   exprt extended_digit=in_interval_expr(chr, 0x6F0, 0x6F9);
@@ -526,6 +531,7 @@ codet character_refine_preprocesst::convert_is_digit_int(
 exprt character_refine_preprocesst::expr_of_is_high_surrogate(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return in_interval_expr(chr, 0xD800, 0xDBFF);
 }
 
@@ -550,6 +556,7 @@ codet character_refine_preprocesst::convert_is_high_surrogate(
 exprt character_refine_preprocesst::expr_of_is_identifier_ignorable(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   or_exprt ignorable(
     in_interval_expr(chr, 0x0000, 0x0008),
      or_exprt(
@@ -777,6 +784,7 @@ codet character_refine_preprocesst::convert_is_low_surrogate(
 exprt character_refine_preprocesst::expr_of_is_mirrored(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return in_list_expr(chr, {0x28, 0x29, 0x3C, 0x3E, 0x5B, 0x5D, 0x7B, 0x7D});
 }
 
@@ -819,6 +827,7 @@ codet character_refine_preprocesst::convert_is_space(conversion_inputt &target)
 exprt character_refine_preprocesst::expr_of_is_space_char(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   std::list<mp_integer> space_characters=
     {0x20, 0x00A0, 0x1680, 0x202F, 0x205F, 0x3000, 0x2028, 0x2029};
   exprt condition0=in_list_expr(chr, space_characters);
@@ -853,6 +862,7 @@ codet character_refine_preprocesst::convert_is_space_char_int(
 exprt character_refine_preprocesst::expr_of_is_supplementary_code_point(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return binary_relation_exprt(chr, ID_gt, from_integer(0xFFFF, chr.type()));
 }
 
@@ -873,6 +883,7 @@ codet character_refine_preprocesst::convert_is_supplementary_code_point(
 exprt character_refine_preprocesst::expr_of_is_surrogate(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return in_interval_expr(chr, 0xD800, 0xDFFF);
 }
 
@@ -909,6 +920,7 @@ codet character_refine_preprocesst::convert_is_surrogate_pair(
 exprt character_refine_preprocesst::expr_of_is_title_case(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   std::list<mp_integer>title_case_chars=
     {0x01C5, 0x01C8, 0x01CB, 0x01F2, 0x1FBC, 0x1FCC, 0x1FFC};
   exprt::operandst conditions;
@@ -946,6 +958,7 @@ codet character_refine_preprocesst::convert_is_title_case_int(
 exprt character_refine_preprocesst::expr_of_is_letter_number(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   // The following set of characters is the general category "Nl" in the
   // Unicode specification.
   exprt cond0=in_interval_expr(chr, 0x16EE, 0x16F0);
@@ -1059,6 +1072,7 @@ codet character_refine_preprocesst::convert_is_upper_case_int(
 exprt character_refine_preprocesst::expr_of_is_valid_code_point(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   return binary_relation_exprt(chr, ID_le, from_integer(0x10FFFF, chr.type()));
 }
 
@@ -1083,6 +1097,7 @@ codet character_refine_preprocesst::convert_is_valid_code_point(
 exprt character_refine_preprocesst::expr_of_is_whitespace(
   const exprt &chr, const typet &type)
 {
+  (void)type; // unused parameter
   exprt::operandst conditions;
   std::list<mp_integer> space_characters=
     {0x20, 0x1680, 0x205F, 0x3000, 0x2028, 0x2029};

jbmc/src/java_bytecode/java_bytecode_concurrency_instrumentation.cpp

@@ -342,6 +342,7 @@ static void instrument_end_thread(
   const symbol_tablet &symbol_table)
 {
   PRECONDITION(f_code.arguments().size() == 1);
+  (void)symbol_table; // unused parameter
 
   // Build id, used to construct appropriate labels.
   // Note: java does not have labels so this should be safe

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -1198,7 +1198,7 @@ bool java_bytecode_languaget::to_expr(
   exprt &expr,
   const namespacet &ns)
 {
-  #if 0
+#if 0
   expr.make_nil();
 
   // no preprocessing yet...
@@ -1234,7 +1234,13 @@ bool java_bytecode_languaget::to_expr(
   java_bytecode_parser.clear();
 
   return result;
-  #endif
+#else
+  // unused parameters
+  (void)code;
+  (void)module;
+  (void)expr;
+  (void)ns;
+#endif
 
   return true; // fail for now
 }
@@ -1249,5 +1255,6 @@ java_bytecode_languaget::~java_bytecode_languaget()
 std::vector<load_extra_methodst>
 java_bytecode_languaget::build_extra_entry_points(const optionst &options) const
 {
+  (void)options; // unused parameter
   return {};
 }

jbmc/src/java_bytecode/java_bytecode_typecheck.cpp

@@ -90,7 +90,7 @@ bool java_bytecode_typecheck(
   message_handlert &message_handler,
   const namespacet &ns)
 {
-  #if 0
+#if 0
   symbol_tablet symbol_table;
   java_bytecode_parse_treet java_bytecode_parse_tree;
 
@@ -119,7 +119,12 @@ bool java_bytecode_typecheck(
   }
 
   return java_bytecode_typecheck.get_error_found();
-  #endif
+#else
+  // unused parameters
+  (void)expr;
+  (void)message_handler;
+  (void)ns;
+#endif
 
   // fail for now
   return true;

jbmc/src/java_bytecode/java_enum_static_init_unwind_handler.cpp

@@ -70,6 +70,8 @@ tvt java_enum_static_init_unwind_handler(
   unsigned &unwind_max,
   const symbol_tablet &symbol_table)
 {
+  (void)loop_number; // unused parameter
+
   const irep_idt enum_function_id = find_enum_function_on_stack(context);
   if(enum_function_id.empty())
     return tvt::unknown();

jbmc/src/java_bytecode/java_local_variable_table.cpp

@@ -549,6 +549,8 @@ static void merge_variable_table_entries(
             << merge_into.var.name << "; new live range "
             << merge_into.var.start_pc << '-'
             << merge_into.var.start_pc + merge_into.var.length << '\n';
+#else
+  (void)debug_out; // unused parameter
 #endif
 
   // Nuke the now-subsumed var-table entries:

jbmc/src/java_bytecode/select_pointer_type.cpp

@@ -29,6 +29,7 @@ pointer_typet select_pointer_typet::convert_pointer_type(
     &generic_parameter_specialization_map,
   const namespacet &ns) const
 {
+  (void)ns; // unused parameter
   // if we have a map of generic parameters -> types and the pointer is
   // a generic parameter, specialize it with concrete types
   if(!generic_parameter_specialization_map.empty())
@@ -229,5 +230,8 @@ std::set<symbol_typet> select_pointer_typet::get_parameter_alternative_types(
   const irep_idt &parameter_name,
   const namespacet &ns) const
 {
+  // unused parameters
+  (void)function_name;
+  (void)parameter_name;
   return {};
 }

src/analyses/ai_domain.h

@@ -104,6 +104,7 @@ class ai_domain_baset
   /// return true if unchanged
   virtual bool ai_simplify(exprt &condition, const namespacet &ns) const
   {
+    (void)condition; // unused parameter
     return true;
   }
 

src/analyses/constant_propagator.cpp

@@ -237,6 +237,8 @@ bool constant_propagator_domaint::two_way_propagate_rec(
 {
 #ifdef DEBUG
   std::cout << "two_way_propagate_rec: " << format(expr) << '\n';
+#else
+  (void)expr; // unused parameter
 #endif
 
   bool change=false;
@@ -268,6 +270,8 @@ bool constant_propagator_domaint::two_way_propagate_rec(
        assign_rec(values, rhs, lhs, ns);
     change = values.meet(copy_values, ns);
   }
+#else
+  (void)cp;   // unused parameter
 #endif
 
 #ifdef DEBUG

src/analyses/local_may_alias.cpp

@@ -328,7 +328,8 @@ void local_may_aliast::build(const goto_functiont &goto_function)
 
   loc_infos.resize(cfg.nodes.size());
 
-  #if 0
+  (void)goto_function; // unused parameter
+#if 0
   // feed in sufficiently bad defaults
   for(code_typet::parameterst::const_iterator
       it=goto_function.type.parameters().begin();
@@ -340,9 +341,9 @@ void local_may_aliast::build(const goto_functiont &goto_function)
       loc_infos[0].points_to[objects.number(identifier)].objects.insert(
         unknown_object);
   }
-  #endif
+#endif
 
-  #if 0
+#if 0
   for(localst::locals_mapt::const_iterator
       l_it=locals.locals_map.begin();
       l_it!=locals.locals_map.end();
@@ -352,7 +353,7 @@ void local_may_aliast::build(const goto_functiont &goto_function)
       loc_infos[0].aliases.make_union(
         objects.number(l_it->second), unknown_object);
   }
-  #endif
+#endif
 
   while(!work_queue.empty())
   {

src/analyses/uncaught_exceptions_analysis.cpp

@@ -182,6 +182,7 @@ void uncaught_exceptions_analysist::collect_uncaught_exceptions(
 void uncaught_exceptions_analysist::output(
   const goto_functionst &goto_functions) const
 {
+  (void)goto_functions; // unused parameter
 #ifdef DEBUG
   forall_goto_functions(it, goto_functions)
   {

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -750,11 +750,13 @@ bool goto_analyzer_parse_optionst::process_goto_program(
     remove_vector(goto_model);
     remove_complex(goto_model);
 
-    #if 0
+#if 0
     // add generic checks
     status() << "Generic Property Instrumentation" << eom;
     goto_check(options, goto_model);
-    #endif
+#else
+    (void)options; // unused parameter
+#endif
 
     // recalculate numbers, etc.
     goto_model.goto_functions.update();

src/goto-cc/hybrid_binary.cpp

@@ -93,6 +93,10 @@ int hybrid_binary(
   }
 
 #else
+  // unused parameters
+  (void)compiler_or_linker;
+  (void)goto_binary_file;
+  (void)output_file;
   message.error() << "binary merging not implemented for this platform"
                   << messaget::eom;
   result = 1;

src/goto-instrument/accelerate/polynomial_accelerator.cpp

@@ -450,6 +450,10 @@ bool polynomial_acceleratort::fit_const(
   exprt &target,
   polynomialt &poly)
 {
+  // unused parameters
+  (void)body;
+  (void)target;
+  (void)poly;
   return false;
 
 #if 0

src/goto-instrument/accelerate/scratch_program.cpp

@@ -185,6 +185,7 @@ void scratch_programt::append_loop(
   append(program);
 
   // Update any back jumps to the loop header.
+  (void)loop_header; // unused parameter
   assume(false_exprt());
 
   goto_programt::targett end=add_instruction(SKIP);

src/goto-instrument/cover_basic_blocks.h

@@ -14,9 +14,9 @@ Author: Daniel Kroening
 
 #include <unordered_set>
 
-#include <goto-programs/goto_model.h>
+#include <util/message.h>
 
-class message_handlert;
+#include <goto-programs/goto_model.h>
 
 class cover_blocks_baset
 {
@@ -49,6 +49,9 @@ class cover_blocks_baset
     const goto_programt &goto_program,
     message_handlert &message_handler)
   {
+    // unused parameters
+    (void)goto_program;
+    (void)message_handler;
   }
 };
 

src/goto-instrument/cover_filter.cpp

@@ -51,6 +51,7 @@ bool include_pattern_filtert::operator()(
   const irep_idt &identifier,
   const goto_functionst::goto_functiont &goto_function) const
 {
+  (void)goto_function; // unused parameter
   std::smatch string_matcher;
   return std::regex_match(id2string(identifier), string_matcher, regex_matcher);
 }
@@ -67,6 +68,7 @@ bool trivial_functions_filtert::operator()(
   const irep_idt &identifier,
   const goto_functionst::goto_functiont &goto_function) const
 {
+  (void)identifier; // unused parameter
   unsigned long count_assignments = 0, count_goto = 0;
   forall_goto_program_instructions(i_it, goto_function.body)
   {

src/goto-instrument/full_slicer_class.h

@@ -99,6 +99,8 @@ class full_slicert
   {
 #ifdef DEBUG_FULL_SLICERT
     cfg[entry].required_by.insert(reason->location_number);
+#else
+    (void)reason; // unused parameter
 #endif
     queue.push(entry);
   }

src/goto-instrument/rw_set.h

@@ -87,7 +87,10 @@ class rw_set_baset
   void output(std::ostream &out) const;
 
 protected:
-  virtual void track_deref(const entryt &, bool read) {}
+  virtual void track_deref(const entryt &, bool read)
+  {
+    (void)read; // unused parameter
+  }
   virtual void set_track_deref() {}
   virtual void reset_track_deref() {}
 

src/goto-instrument/wmm/data_dp.cpp

@@ -185,5 +185,7 @@ void data_dpt::print(messaget &message)
     for(l_it=m_it->second.begin(); l_it!=m_it->second.end(); ++l_it)
       message.debug()<< "loc: "<<*l_it << messaget::eom;
   }
+#else
+  (void)message; // unused parameter
 #endif
 }