Support arbitrary slice constants for pattern deaggregation

diff --git a/src/librustc_mir/hair/pattern/_match.rs b/src/librustc_mir/hair/pattern/_match.rs
index 87b35b1c5345118e8d1e3ce67f104ed5ed1b14a2..3c44ba0ad230b5d8fe6df610875f2bb2ea2730d7 100644 (file)
--- a/src/librustc_mir/hair/pattern/_match.rs
+++ b/src/librustc_mir/hair/pattern/_match.rs
@@ -309,6 +309,7 @@ pub struct MatchCheckCtxt<'a, 'tcx: 'a> {
     /// outside it's module and should not be matchable with an empty match
     /// statement.
     pub module: DefId,
+    param_env: ty::ParamEnv<'tcx>,
     pub pattern_arena: &'a TypedArena<Pattern<'tcx>>,
     pub byte_array_map: FxHashMap<*const Pattern<'tcx>, Vec<&'a Pattern<'tcx>>>,
 }
@@ -316,6 +317,7 @@ pub struct MatchCheckCtxt<'a, 'tcx: 'a> {
 impl<'a, 'tcx> MatchCheckCtxt<'a, 'tcx> {
     pub fn create_and_enter<F, R>(
         tcx: TyCtxt<'a, 'tcx, 'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
         module: DefId,
         f: F) -> R
         where F: for<'b> FnOnce(MatchCheckCtxt<'b, 'tcx>) -> R
@@ -324,6 +326,7 @@ pub fn create_and_enter<F, R>(
 
         f(MatchCheckCtxt {
             tcx,
+            param_env,
             module,
             pattern_arena: &pattern_arena,
             byte_array_map: FxHashMap::default(),
@@ -1668,17 +1671,14 @@ fn specialize<'p, 'a: 'p, 'tcx: 'a>(
                     // necessarily point to memory, they are usually just integers. The only time
                     // they should be pointing to memory is when they are subslices of nonzero
                     // slices
-                    let (opt_ptr, data_len) = match value.ty.builtin_deref(false).unwrap().ty.sty {
-                        ty::TyKind::Array(t, n) => {
-                            assert!(t == cx.tcx.types.u8);
-                            (value.to_ptr(), n.unwrap_usize(cx.tcx))
-                        },
+                    let (opt_ptr, n, ty) = match value.ty.builtin_deref(false).unwrap().ty.sty {
+                        ty::TyKind::Array(t, n) => (value.to_ptr(), n.unwrap_usize(cx.tcx), t),
                         ty::TyKind::Slice(t) => {
-                            assert!(t == cx.tcx.types.u8);
                             match value.val {
                                 ConstValue::ScalarPair(ptr, n) => (
                                     ptr.to_ptr().ok(),
-                                    n.to_bits(cx.tcx.data_layout.pointer_size).unwrap() as u64
+                                    n.to_bits(cx.tcx.data_layout.pointer_size).unwrap() as u64,
+                                    t,
                                 ),
                                 _ => span_bug!(
                                     pat.span,
@@ -1694,26 +1694,27 @@ fn specialize<'p, 'a: 'p, 'tcx: 'a>(
                             constructor,
                         ),
                     };
-                    if wild_patterns.len() as u64 == data_len {
-                        // convert a byte-string pattern to a list of u8 patterns.
-                        match (data_len, opt_ptr) {
+                    if wild_patterns.len() as u64 == n {
+                        // convert a constant slice/array pattern to a list of patterns.
+                        match (n, opt_ptr) {
                             (0, _) => Some(Vec::new()),
                             (_, Some(ptr)) => {
                                 let alloc = cx.tcx.alloc_map.lock().unwrap_memory(ptr.alloc_id);
-                                // FIXME: use `Allocation::read_bytes` once available
-                                assert_eq!(ptr.offset.bytes(), 0);
-                                Some(alloc.bytes.iter().map(|b| {
-                                    &*cx.pattern_arena.alloc(Pattern {
-                                        ty: cx.tcx.types.u8,
+                                let layout = cx.tcx.layout_of(cx.param_env.and(ty)).ok()?;
+                                (0..n).map(|i| {
+                                    let ptr = ptr.offset(layout.size * i, &cx.tcx).ok()?;
+                                    let scalar = alloc.read_scalar(
+                                        &cx.tcx, ptr, layout.size,
+                                    ).ok()?;
+                                    let scalar = scalar.not_undef().ok()?;
+                                    let value = ty::Const::from_scalar(cx.tcx, scalar, ty);
+                                    let pattern = Pattern {
+                                        ty,
                                         span: pat.span,
-                                        kind: box PatternKind::Constant {
-                                            value: ty::Const::from_bits(
-                                                cx.tcx,
-                                                *b as u128,
-                                                ty::ParamEnv::empty().and(cx.tcx.types.u8))
-                                        },
-                                    })
-                                }).collect())
+                                        kind: box PatternKind::Constant { value },
+                                    };
+                                    Some(&*cx.pattern_arena.alloc(pattern))
+                                }).collect()
                             },
                             (_, None) => span_bug!(
                                 pat.span,

diff --git a/src/librustc_mir/hair/pattern/check_match.rs b/src/librustc_mir/hair/pattern/check_match.rs
index bafabe4e9972cf474ff4752f02a89107033730c1..800f644f7f5957bb878003495c67c899476dbdbc 100644 (file)
--- a/src/librustc_mir/hair/pattern/check_match.rs
+++ b/src/librustc_mir/hair/pattern/check_match.rs
@@ -193,7 +193,7 @@ fn check_match(
         }
 
         let module = self.tcx.hir.get_module_parent(scrut.id);
-        MatchCheckCtxt::create_and_enter(self.tcx, module, |ref mut cx| {
+        MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |ref mut cx| {
             let mut have_errors = false;
 
             let inlined_arms : Vec<(Vec<_>, _)> = arms.iter().map(|arm| (
@@ -268,7 +268,7 @@ fn conservative_is_uninhabited(&self, scrutinee_ty: Ty<'tcx>) -> bool {
 
     fn check_irrefutable(&self, pat: &'tcx Pat, origin: &str) {
         let module = self.tcx.hir.get_module_parent(pat.id);
-        MatchCheckCtxt::create_and_enter(self.tcx, module, |ref mut cx| {
+        MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |ref mut cx| {
             let mut patcx = PatternContext::new(self.tcx,
                                                 self.param_env.and(self.identity_substs),
                                                 self.tables);

diff --git a/src/test/ui/pattern/slice-pattern-const-2.rs b/src/test/ui/pattern/slice-pattern-const-2.rs
new file mode 100644 (file)
index 0000000..328ba3d
--- /dev/null
+++ b/src/test/ui/pattern/slice-pattern-const-2.rs
@@ -0,0 +1,11 @@
+// compile-pass
+
+fn main() {
+       let s = &[0x00; 4][..]; //Slice of any value
+       const MAGIC_TEST: &[u32] = &[4, 5, 6, 7]; //Const slice to pattern match with
+       match s {
+               MAGIC_TEST => (),
+               [0x00, 0x00, 0x00, 0x00] => (),
+               _ => (),
+       }
+}

diff --git a/src/test/ui/pattern/slice-pattern-const-3.rs b/src/test/ui/pattern/slice-pattern-const-3.rs
new file mode 100644 (file)
index 0000000..aedd982
--- /dev/null
+++ b/src/test/ui/pattern/slice-pattern-const-3.rs
@@ -0,0 +1,11 @@
+// compile-pass
+
+fn main() {
+       let s = &["0x00"; 4][..]; //Slice of any value
+       const MAGIC_TEST: &[&str] = &["4", "5", "6", "7"]; //Const slice to pattern match with
+       match s {
+               MAGIC_TEST => (),
+               ["0x00", "0x00", "0x00", "0x00"] => (),
+               _ => (),
+       }
+}

diff --git a/src/test/ui/pattern/slice-pattern-const.rs b/src/test/ui/pattern/slice-pattern-const.rs
index 6fcf197c7ae0d62c9c13b51cffe3fd63a41df6c8..c3b11111f8e58aa64d5fe79bd4960fe0f8c6cbc0 100644 (file)
--- a/src/test/ui/pattern/slice-pattern-const.rs
+++ b/src/test/ui/pattern/slice-pattern-const.rs
@@ -6,6 +6,6 @@ fn main() {
        match s {
                MAGIC_TEST => (),
                [0x00, 0x00, 0x00, 0x00] => (),
-               _ => ()
+               _ => (),
        }
-}
\ No newline at end of file
+}