---

yaml
---
r: 98171
b: refs/heads/master
c: 4b52d89
h: refs/heads/master
i:
  98169: d61f659
  98167: ed08e10
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 14b0abfd8204aa7673065800c4b8c2572eb5427f
+refs/heads/master: 4b52d899fffd8e6ef01a5a05c1d513278a7823bd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

trunk/src/librustc/middle/trans/common.rs

@@ -64,7 +64,7 @@ pub fn type_is_immediate(ccx: &CrateContext, ty: ty::t) -> bool {
     let tcx = ccx.tcx;
     let simple = ty::type_is_scalar(ty) || ty::type_is_boxed(ty) ||
         ty::type_is_unique(ty) || ty::type_is_region_ptr(ty) ||
-        type_is_newtype_immediate(ccx, ty) ||
+        type_is_newtype_immediate(ccx, ty) || ty::type_is_bot(ty) ||
         ty::type_is_simd(tcx, ty);
     if simple {
         return true;
@@ -75,7 +75,7 @@ pub fn type_is_immediate(ccx: &CrateContext, ty: ty::t) -> bool {
             let llty = sizing_type_of(ccx, ty);
             llsize_of_alloc(ccx, llty) <= llsize_of_alloc(ccx, ccx.int_type)
         }
-        _ => false
+        _ => type_is_voidish(ccx, ty)
     }
 }
 

trunk/src/librustc/middle/trans/tvec.rs

@@ -553,7 +553,6 @@ pub fn get_base_and_byte_len(bcx: &Block,
 
     match vstore {
         ty::vstore_fixed(n) => {
-            assert!(!type_is_immediate(bcx.ccx(), vt.vec_ty));
             let base = GEPi(bcx, llval, [0u, 0u]);
             let len = Mul(bcx, C_uint(ccx, n), vt.llunit_size);
             (base, len)
@@ -596,7 +595,6 @@ pub fn get_base_and_len(bcx: &Block,
 
     match vstore {
         ty::vstore_fixed(n) => {
-            assert!(!type_is_immediate(bcx.ccx(), vt.vec_ty));
             let base = GEPi(bcx, llval, [0u, 0u]);
             (base, C_uint(ccx, n))
         }