bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #17182 : luqmana/rust/rnp, r=alexcrichton

Browse source 
Fixes #17120.
This commit is contained in:
bors 2014-09-13 11:25:59 +00:00
commit 13475a0851
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc/middle/trans/adt.rs
View file

@ -298,9 +298,8 @@ impl Case {
for (i, &ty) in self.tys.iter().enumerate() {
match ty::get(ty).sty {
// &T/&mut T/*T could either be a thin or fat pointer depending on T
ty::ty_rptr(_, ty::mt { ty, .. })
| ty::ty_ptr(ty::mt { ty, .. }) => match ty::get(ty).sty {
// &T/&mut T could either be a thin or fat pointer depending on T
ty::ty_rptr(_, ty::mt { ty, .. }) => match ty::get(ty).sty {
// &[T] and &str are a pointer and length pair
ty::ty_vec(_, None) | ty::ty_str => return Some(FatPointer(i, slice_elt_base)),

5
src/test/run-pass/enum-null-pointer-opt.rs
View file

@ -37,4 +37,9 @@ fn main() {
assert_eq!(size_of::<Box<int>>(), size_of::<Option<Box<int>>>());
assert_eq!(size_of::<Gc<int>>(), size_of::<Option<Gc<int>>>());
// The optimization can't apply to raw pointers
assert!(size_of::<Option<*const int>>() != size_of::<*const int>());
assert!(Some(0 as *const int).is_some()); // Can't collapse None to null
}