Skip to content

prevector: fix 2 bugs in currently unreached code paths #7888

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
laanwj merged 3 commits into from
Apr 18, 2016
Merged

prevector: fix 2 bugs in currently unreached code paths #7888

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2c29f
prevector: destroy elements only via erase()
kazcw Apr 13, 2016
4ed41a2
test prevector::swap
kazcw Apr 16, 2016
a7af72a
prevector::swap: fix (unreached) data corruption
kazcw Apr 14, 2016
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
Prev Previous commit
prevector::swap: fix (unreached) data corruption 
swap was using an incorrect condition to determine when to apply an optimization
(not swapping the full direct[] when swapping two indirect prevectors).

Rather than correct the optimization I'm removing it for simplicity. Removing
this optimization minutely improves performance in the typical (currently only)
usage of member swap(), which is swapping with a freshly value-initialized
object.
  • Loading branch information
@kazcw
kazcw committed Apr 16, 2016
commit a7af72a697a8decab364792230153f114be3919c
7 changes: 1 addition & 6 deletions src/prevector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,7 @@ class prevector {
}

void swap(prevector<N, T, Size, Diff>& other) {
if (_size & other._size & 1) {
std::swap(_union.capacity, other._union.capacity);
std::swap(_union.indirect, other._union.indirect);
} else {
std::swap(_union, other._union);
}
std::swap(_union, other._union);
std::swap(_size, other._size);
}

Expand Down