Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Check bounds when looking up type parameters
A mismatched type with more type parameters than the expected one causes
`typeck` looking up out of the bound of type parameter vector, which
leads to ICE.

Closes #13466
  • Loading branch information
edwardw committed Apr 12, 2014
1 parent ecc774f commit fc043c0
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 12 deletions.
21 changes: 11 additions & 10 deletions src/librustc/middle/typeck/check/vtable.rs
Expand Up @@ -242,16 +242,17 @@ fn lookup_vtable(vcx: &VtableContext,
// bounds to see if they include the trait we are looking for.
let vtable_opt = match ty::get(ty).sty {
ty::ty_param(param_ty {idx: n, ..}) => {
let type_param_bounds: &[@ty::TraitRef] =
vcx.param_env
.type_param_bounds
.get(n)
.trait_bounds
.as_slice();
lookup_vtable_from_bounds(vcx, span,
type_param_bounds,
param_numbered(n),
trait_ref)
let env_bounds = &vcx.param_env.type_param_bounds;
if env_bounds.len() > n {
let type_param_bounds: &[@ty::TraitRef] =
env_bounds.get(n).trait_bounds.as_slice();
lookup_vtable_from_bounds(vcx, span,
type_param_bounds,
param_numbered(n),
trait_ref)
} else {
None
}
}

ty::ty_self(_) => {
Expand Down
5 changes: 3 additions & 2 deletions src/librustc/util/ppaux.rs
Expand Up @@ -393,8 +393,9 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> ~str {
ty_param(param_ty {idx: id, def_id: did}) => {
let ident = match cx.ty_param_defs.borrow().find(&did.node) {
Some(def) => token::get_ident(def.ident).get().to_str(),
// This should not happen...
None => format!("BUG[{:?}]", id)
// This can only happen when a type mismatch error happens and
// the actual type has more type parameters than the expected one.
None => format!("<generic \\#{}>", id)
};
if !cx.sess.verbose() {
ident
Expand Down
22 changes: 22 additions & 0 deletions src/test/compile-fail/issue-13466.rs
@@ -0,0 +1,22 @@
// Copyright 2014 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.

// Regression test for #13466

pub fn main() {
// The expected arm type `Option<T>` has one type parameter, while
// the actual arm `Result<T, E>` has two. typeck should not be
// tricked into looking up a non-existing second type parameter.
let _x: uint = match Some(1u) {
//~^ ERROR mismatched types: expected `uint` but found `<generic #0>`
Ok(u) => u, //~ ERROR mismatched types: expected `std::option::Option<uint>`
Err(e) => fail!(e) //~ ERROR mismatched types: expected `std::option::Option<uint>`
};
}

9 comments on commit fc043c0

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at edwardw@fc043c0

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging edwardw/rust/vtable-ice = fc043c0 into auto

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

edwardw/rust/vtable-ice = fc043c0 merged ok, testing candidate = 3efeac51

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at edwardw@fc043c0

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging edwardw/rust/vtable-ice = fc043c0 into auto

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

edwardw/rust/vtable-ice = fc043c0 merged ok, testing candidate = 347e9e4

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

@bors
Copy link
Contributor

@bors bors commented on fc043c0 Apr 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 347e9e4

Please sign in to comment.