---

yaml
---
r: 107427
b: refs/heads/dist-snap
c: 4b52d89
h: refs/heads/master
i:
  107425: 0f9357b
  107423: 4c91514
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 14b0abfd8204aa7673065800c4b8c2572eb5427f
+refs/heads/dist-snap: 4b52d899fffd8e6ef01a5a05c1d513278a7823bd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)
     }
 }
 

branches/dist-snap/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))
         }