Skip to content

Fixed take from incremental vector with no frames #125

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
misonijnik merged 1 commit into from
Sep 26, 2023
Merged

Fixed take from incremental vector with no frames #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions include/klee/ADT/Incremental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ void extend(std::vector<_Tp, _Alloc> &ths,
ths.insert(ths.end(), other.begin(), other.end());
}

template <typename _Tp, typename _Alloc>
void takeAfterv(std::vector<_Tp, _Alloc> &ths, size_t n) {
std::vector<_Tp, _Alloc>(ths.begin() + n, ths.end()).swap(ths);
}

template <typename _Tp, typename _Alloc = std::allocator<_Tp>>
class inc_vector {
public:
Expand Down Expand Up @@ -131,12 +136,9 @@ class inc_vector {
size_t frames_count, frame_index;
take(n, frames_count, frame_index);
result = *this;
std::vector<_Tp, _Alloc>(result.v.begin() + n, result.v.end())
.swap(result.v);
std::vector<size_t>(result.frame_sizes.begin() + frame_index,
result.frame_sizes.end())
.swap(result.frame_sizes);
if (frames_count)
takeAfterv(result.v, n);
takeAfterv(result.frame_sizes, frame_index);
if (frames_count && !result.frame_sizes.empty())
result.frame_sizes[0] -= frames_count;
}

Expand Down
Loading