Skip to content

Commit

Permalink
check_match: Dereference ref x before comparing it and some other type
Browse files Browse the repository at this point in the history
The arity of `ref x` is always 1, so it needs to be dereferenced before
being compared with some other type whose arity is not 1.

Fixes #23009.
  • Loading branch information
barosl committed Mar 14, 2015
1 parent 766a4e1 commit edbc0e5
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/librustc/middle/check_match.rs
Expand Up @@ -646,6 +646,7 @@ fn is_useful(cx: &MatchCheckCtxt,
if rows[0].len() == 0 {
return NotUseful;
}
assert!(rows.iter().all(|r| r.len() == v.len()));
let real_pat = match rows.iter().find(|r| (*r)[0].id != DUMMY_NODE_ID) {
Some(r) => raw_pat(r[0]),
None if v.len() == 0 => return NotUseful,
Expand All @@ -654,7 +655,12 @@ fn is_useful(cx: &MatchCheckCtxt,
let left_ty = if real_pat.id == DUMMY_NODE_ID {
ty::mk_nil(cx.tcx)
} else {
ty::pat_ty(cx.tcx, &*real_pat)
let left_ty = ty::pat_ty(cx.tcx, &*real_pat);

match real_pat.node {
ast::PatIdent(ast::BindByRef(..), _, _) => ty::deref(left_ty, false).unwrap().ty,
_ => left_ty,
}
};

let max_slice_length = rows.iter().filter_map(|row| match row[0].node {
Expand Down
24 changes: 24 additions & 0 deletions src/test/compile-fail/match-ref-ice.rs
@@ -0,0 +1,24 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// The arity of `ref x` is always 1. If the pattern is compared to some non-structural type whose
// arity is always 0, an ICE occurs.
//
// Related issue: #23009

fn main() {
let homura = [1, 2, 3];

match homura {
[1, ref madoka, 3] => (),
[1, 2, 3] => (), //~ ERROR unreachable pattern
[_, _, _] => (),
}
}

0 comments on commit edbc0e5

Please sign in to comment.