---

yaml
---
r: 42882
b: refs/heads/try
c: 76679c1
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 63c16e9e79839ba767e2a8c7172d9a330c782600
+refs/heads/try: 76679c1f91fc68134c850b2d77ff2b83b32a108f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/trans/glue.rs

@@ -571,9 +571,30 @@ pub fn decr_refcnt_maybe_free(bcx: block,
     }
 }
 
+pub fn copy_glue_should_never_be_called(bcx: block, t: ty::t) -> bool {
+    match ty::get(t).sty {
+        ty::ty_infer(*)
+        | ty::ty_type
+        | ty::ty_opaque_closure_ptr(*)
+        | ty::ty_opaque_box
+        | ty::ty_unboxed_vec(*)
+        | ty::ty_err => {
+            // Not sure under what scenarios these non-types get take glue
+            false
+        }
+        _ => !ty::type_is_copyable(bcx.tcx(), t)
+    }
+}
 
 pub fn make_take_glue(bcx: block, v: ValueRef, t: ty::t) {
     let _icx = bcx.insn_ctxt("make_take_glue");
+
+    if copy_glue_should_never_be_called(bcx, t) {
+        controlflow::trans_fail(bcx, bcx.fcx.span,
+                                ~"calling take glue on non-copyable");
+        return;
+    }
+
     // NB: v is a *pointer* to type t here, not a direct value.
     let bcx = match ty::get(t).sty {
       ty::ty_box(_) | ty::ty_opaque_box |

branches/try/src/librustc/middle/ty.rs

@@ -2181,7 +2181,8 @@ pub fn type_kind_ext(cx: ctxt, ty: t, allow_ty_var: bool) -> Kind {
 
       ty_type | ty_opaque_closure_ptr(_)
       | ty_opaque_box | ty_unboxed_vec(_) | ty_err => {
-        cx.sess.bug(~"Asked to compute kind of fictitious type");
+          kind_copyable()
+        //cx.sess.bug(~"Asked to compute kind of fictitious type");
       }
     };