Correct types from unsigned to std::size_t

The block numbers in cover_basic_blockst are obtained from
`block_info.size() - 1`, they should have type std::size_t rather than
unsigned.

Also mark const a couple of arguments that are constant.

Author: romainbrenguier

src/goto-instrument/cover_basic_blocks.cpp

@@ -15,7 +15,7 @@ Author: Peter Schrammel
 #include <util/message.h>
 #include <util/string2int.h>
 
-optionalt<unsigned> cover_basic_blockst::continuation_of_block(
+optionalt<std::size_t> cover_basic_blockst::continuation_of_block(
   const goto_programt::const_targett &instruction,
   cover_basic_blockst::block_mapt &block_map)
 {
@@ -32,7 +32,7 @@ optionalt<unsigned> cover_basic_blockst::continuation_of_block(
 cover_basic_blockst::cover_basic_blockst(const goto_programt &_goto_program)
 {
   bool next_is_target = true;
-  unsigned current_block = 0;
+  std::size_t current_block = 0;
 
   forall_goto_program_instructions(it, _goto_program)
   {
@@ -87,22 +87,22 @@ cover_basic_blockst::cover_basic_blockst(const goto_programt &_goto_program)
     update_covered_lines(block_info);
 }
 
-unsigned cover_basic_blockst::block_of(goto_programt::const_targett t) const
+std::size_t cover_basic_blockst::block_of(goto_programt::const_targett t) const
 {
   const auto it = block_map.find(t);
   INVARIANT(it != block_map.end(), "instruction must be part of a block");
   return it->second;
 }
 
 optionalt<goto_programt::const_targett>
-cover_basic_blockst::instruction_of(unsigned block_nr) const
+cover_basic_blockst::instruction_of(const std::size_t block_nr) const
 {
   INVARIANT(block_nr < block_infos.size(), "block number out of range");
   return block_infos.at(block_nr).representative_inst;
 }
 
 const source_locationt &
-cover_basic_blockst::source_location_of(unsigned block_nr) const
+cover_basic_blockst::source_location_of(const std::size_t block_nr) const
 {
   INVARIANT(block_nr < block_infos.size(), "block number out of range");
   return block_infos.at(block_nr).source_location;
@@ -113,12 +113,12 @@ void cover_basic_blockst::select_unique_java_bytecode_indices(
   message_handlert &message_handler)
 {
   messaget msg(message_handler);
-  std::set<unsigned> blocks_seen;
+  std::set<std::size_t> blocks_seen;
   std::set<irep_idt> bytecode_indices_seen;
 
   forall_goto_program_instructions(it, goto_program)
   {
-    const unsigned block_nr = block_of(it);
+    const std::size_t block_nr = block_of(it);
     if(blocks_seen.find(block_nr) != blocks_seen.end())
       continue;
 
@@ -181,10 +181,10 @@ void cover_basic_blockst::report_block_anomalies(
   message_handlert &message_handler)
 {
   messaget msg(message_handler);
-  std::set<unsigned> blocks_seen;
+  std::set<std::size_t> blocks_seen;
   forall_goto_program_instructions(it, goto_program)
   {
-    const unsigned block_nr = block_of(it);
+    const std::size_t block_nr = block_of(it);
     const block_infot &block_info = block_infos.at(block_nr);
 
     if(

src/goto-instrument/cover_basic_blocks.h

@@ -26,18 +26,18 @@ class cover_basic_blockst final
   /// \param t a goto instruction
   /// \return the block number of the block
   ///         the given goto instruction is part of
-  unsigned block_of(goto_programt::const_targett t) const;
+  std::size_t block_of(goto_programt::const_targett t) const;
 
   /// \param block_nr a block number
   /// \return  the instruction selected for
   ///   instrumentation representative of the given block
   optionalt<goto_programt::const_targett>
-  instruction_of(unsigned block_nr) const;
+  instruction_of(std::size_t block_nr) const;
 
   /// \param block_nr a block number
   /// \return  the source location selected for
   ///   instrumentation representative of the given block
-  const source_locationt &source_location_of(unsigned block_nr) const;
+  const source_locationt &source_location_of(std::size_t block_nr) const;
 
   /// Select an instruction to be instrumented for each basic block such that
   /// the java bytecode indices for each basic block is unique
@@ -58,7 +58,7 @@ class cover_basic_blockst final
   void output(std::ostream &out) const;
 
 private:
-  typedef std::map<goto_programt::const_targett, unsigned> block_mapt;
+  typedef std::map<goto_programt::const_targett, std::size_t> block_mapt;
 
   struct block_infot
   {
@@ -71,7 +71,7 @@ class cover_basic_blockst final
     source_locationt source_location;
 
     /// the set of lines belonging to this block
-    std::unordered_set<unsigned> lines;
+    std::unordered_set<std::size_t> lines;
   };
 
   /// map program locations to block numbers
@@ -85,7 +85,7 @@ class cover_basic_blockst final
 
   /// If this block is a continuation of a previous block through unconditional
   /// forward gotos, return this blocks number.
-  static optionalt<unsigned> continuation_of_block(
+  static optionalt<std::size_t> continuation_of_block(
     const goto_programt::const_targett &instruction,
     block_mapt &block_map);
 };