Skip to content

Commit b7de098

Browse files
committed
---
yaml --- r: 183963 b: refs/heads/auto c: 7412d1b h: refs/heads/master i: 183961: 148a1f0 183959: 089effd v: v3
1 parent 7bb8e83 commit b7de098

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 52b5150cfd3dfcdf518675e9073f03e061a63a53
13+
refs/heads/auto: 7412d1b2eff1c77241c54fa39508e7049d71ec7e
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/vec.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ use core::cmp::{Ordering};
5656
use core::default::Default;
5757
use core::fmt;
5858
use core::hash::{self, Hash};
59+
use core::intrinsics::assume;
5960
use core::iter::{repeat, FromIterator, IntoIterator};
6061
use core::marker::{self, ContravariantLifetime, InvariantType};
6162
use core::mem;
@@ -1587,8 +1588,12 @@ impl<T> AsSlice<T> for Vec<T> {
15871588
#[stable(feature = "rust1", since = "1.0.0")]
15881589
fn as_slice(&self) -> &[T] {
15891590
unsafe {
1591+
let p = *self.ptr;
1592+
if cfg!(not(stage0)) { // NOTE remove cfg after next snapshot
1593+
assume(p != 0 as *mut T);
1594+
}
15901595
mem::transmute(RawSlice {
1591-
data: *self.ptr,
1596+
data: p,
15921597
len: self.len
15931598
})
15941599
}

0 commit comments

Comments
 (0)