librustc: Try looking in fixed sized arrays for nullable enum opt.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/librustc_trans/trans/adt.rs b/src/librustc_trans/trans/adt.rs
index 120e894b050..28a2174889c 100644
--- a/src/librustc_trans/trans/adt.rs
+++ b/src/librustc_trans/trans/adt.rs
@@ -390,6 +390,19 @@ fn find_discr_field_candidate<'tcx>(tcx: &ty::ctxt<'tcx>, ty: Ty<'tcx>) -> Optio
             None
         },
 
+        // Is this a fixed-size array of something non-zero
+        // with at least one element?
+        ty::ty_vec(ety, Some(d)) if d > 0 => {
+            match find_discr_field_candidate(tcx, ety) {
+                Some(v) => {
+                    let mut discrfield = vec![0];
+                    discrfield.extend(v.into_iter());
+                    return Some(discrfield);
+                }
+                None => None
+            }
+        },
+
         // Anything else is not a pointer
         _ => None
     }