Skip to content

Commit e457328

Browse files
committed
Eliminate more excessive null-checks from slice iterators
This adds the assume() calls back that got lost when rebasing #21886.
1 parent eb1b500 commit e457328

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/libcollections/vec.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,10 @@ impl<T> Vec<T> {
433433
#[stable(feature = "rust1", since = "1.0.0")]
434434
pub fn as_mut_slice(&mut self) -> &mut [T] {
435435
unsafe {
436+
let ptr = *self.ptr;
437+
assume(!ptr.is_null());
436438
mem::transmute(RawSlice {
437-
data: *self.ptr,
439+
data: ptr,
438440
len: self.len,
439441
})
440442
}
@@ -458,6 +460,7 @@ impl<T> Vec<T> {
458460
pub fn into_iter(self) -> IntoIter<T> {
459461
unsafe {
460462
let ptr = *self.ptr;
463+
assume(!ptr.is_null());
461464
let cap = self.cap;
462465
let begin = ptr as *const T;
463466
let end = if mem::size_of::<T>() == 0 {

src/libcore/slice.rs

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use cmp::{Ordering, PartialEq, PartialOrd, Eq, Ord};
4040
use cmp::Ordering::{Less, Equal, Greater};
4141
use cmp;
4242
use default::Default;
43+
use intrinsics::assume;
4344
use iter::*;
4445
use ops::{FnMut, self, Index};
4546
use ops::RangeFull;
@@ -137,6 +138,7 @@ impl<T> SliceExt for [T] {
137138
fn iter<'a>(&'a self) -> Iter<'a, T> {
138139
unsafe {
139140
let p = self.as_ptr();
141+
assume(!p.is_null());
140142
if mem::size_of::<T>() == 0 {
141143
Iter {ptr: p,
142144
end: (p as usize + self.len()) as *const T,
@@ -276,6 +278,7 @@ impl<T> SliceExt for [T] {
276278
fn iter_mut<'a>(&'a mut self) -> IterMut<'a, T> {
277279
unsafe {
278280
let p = self.as_mut_ptr();
281+
assume(!p.is_null());
279282
if mem::size_of::<T>() == 0 {
280283
IterMut {ptr: p,
281284
end: (p as usize + self.len()) as *mut T,

0 commit comments

Comments
 (0)