Skip to content

Commit 6e32d97

Browse files
committed
---
yaml --- r: 184078 b: refs/heads/beta c: 7412d1b h: refs/heads/master v: v3
1 parent 6752d5f commit 6e32d97

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 52b5150cfd3dfcdf518675e9073f03e061a63a53
34+
refs/heads/beta: 7412d1b2eff1c77241c54fa39508e7049d71ec7e
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: c65fb1a81e5dc58cf171cc47f65de9e6e2119247

branches/beta/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)