Skip to content

Use std::size_t #8648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2025
Merged

Use std::size_t #8648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa04a3
use std::size_t for goto-instruction step_nr
kroening Jun 1, 2025
8bc2048
use std::size_t for an instruction count
kroening Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/goto-programs/goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void show_state_header(
messaget::mstreamt &out,
const namespacet &ns,
const goto_trace_stept &state,
unsigned step_nr,
std::size_t step_nr,
const trace_optionst &options)
{
out << '\n';
Expand Down Expand Up @@ -516,7 +516,7 @@ void show_full_goto_trace(
const goto_tracet &goto_trace,
const trace_optionst &options)
{
unsigned prev_step_nr=0;
std::size_t prev_step_nr = 0;
bool first_step=true;
std::size_t function_depth=0;

Expand Down
16 changes: 8 additions & 8 deletions src/goto-symex/symex_goto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,8 @@ static void merge_names(
symex_target_equationt &target,
const incremental_dirtyt &dirty,
const ssa_exprt &ssa,
const unsigned goto_count,
const unsigned dest_count)
const std::size_t goto_count,
const std::size_t dest_count)
{
const irep_idt l1_identifier = ssa.get_identifier();
const irep_idt &obj_identifier = ssa.get_object_name();
Expand Down Expand Up @@ -876,10 +876,10 @@ void goto_symext::phi_function(
for(const auto &delta_item : delta_view)
{
const ssa_exprt &ssa = delta_item.m.first;
unsigned goto_count = delta_item.m.second;
unsigned dest_count = !delta_item.is_in_both_maps()
? 0
: delta_item.get_other_map_value().second;
std::size_t goto_count = delta_item.m.second;
std::size_t dest_count = !delta_item.is_in_both_maps()
? 0
: delta_item.get_other_map_value().second;

merge_names(
goto_state,
Expand All @@ -905,8 +905,8 @@ void goto_symext::phi_function(
continue;

const ssa_exprt &ssa = delta_item.m.first;
unsigned goto_count = 0;
unsigned dest_count = delta_item.m.second;
std::size_t goto_count = 0;
std::size_t dest_count = delta_item.m.second;

merge_names(
goto_state,
Expand Down
Loading