Skip to content
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

Jump to bottom

sort: Fast path for already sorted data #29675

Merged
merged 2 commits into from
Nov 13, 2015
Merged

sort: Fast path for already sorted data #29675

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35fd1ba
sort: Fast path for already sorted data
bluss Nov 7, 2015
0f5e30d
sort: Guard the fast path by length check
bluss Nov 7, 2015
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
10 changes: 10 additions & 0 deletions src/libcollections/slice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,16 @@ fn merge_sort<T, F>(v: &mut [T], mut compare: F) where F: FnMut(&T, &T) -> Order
let mut out = buf_tmp.offset(start as isize);
let out_end = buf_tmp.offset(right_end_idx as isize);

// if left[last] <= right[0], they are already in order:
// fast-forward the left side (the right side is handled
// in the loop).
if compare(&*right.offset(-1), &*right) != Greater {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs a bounds check actually.

let elems = (right_start as usize - left as usize) / mem::size_of::<T>();
ptr::copy_nonoverlapping(&*left, out, elems);
out = out.offset(elems as isize);
left = right_start;
}

while out < out_end {
// Either the left or the right run are exhausted,
// so just copy the remainder from the other run
Expand Down