---

yaml
---
r: 15324
b: refs/heads/try
c: ab4105d
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 0cf6b613d1d1086e437098207e6790b99b5a9220
+refs/heads/try: ab4105d9e8b7c0719343aa2e4edd15cae0b7c947
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -1072,12 +1072,17 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       // Enums lower to the lowest of their variants.
       ty_enum(did, tps) {
         let mut lowest = kind_sendable;
-        for variant in *enum_variants(cx, did) {
-            for aty in variant.args {
-                // Perform any type parameter substitutions.
-                let arg_ty = substitute_type_params(cx, tps, aty);
-                lowest = lower_kind(lowest, type_kind(cx, arg_ty));
-                if lowest == kind_noncopyable { break; }
+        let variants = enum_variants(cx, did);
+        if vec::len(*variants) == 0u {
+            lowest = kind_noncopyable;
+        } else {
+            for variant in *variants {
+                for aty in variant.args {
+                    // Perform any type parameter substitutions.
+                    let arg_ty = substitute_type_params(cx, tps, aty);
+                    lowest = lower_kind(lowest, type_kind(cx, arg_ty));
+                    if lowest == kind_noncopyable { break; }
+                }
             }
         }
         lowest

branches/try/src/test/compile-fail/non-copyable-void.rs

@@ -0,0 +1,8 @@
+fn main() {
+    let x : *[int] = ptr::addr_of([1,2,3]);
+    let y : *libc::c_void = x as *libc::c_void;
+    unsafe {
+        let _z = *y;
+        //!^ ERROR copying a noncopyable value
+    }
+}