bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc::typeck: fix array out of bounds

Browse source 
Fixes #6155
This commit is contained in:
Philipp Brüschweiler 2013-06-07 22:07:19 +02:00
parent 320995198c
commit 080a462050
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/middle/typeck/check/mod.rs
View file

@ -2728,8 +2728,13 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
}); });
let mut bot_field = false; let mut bot_field = false;
let mut err_field = false; let mut err_field = false;
let elt_ts = do elts.mapi |i, e| { let elt_ts = do elts.mapi |i, e| {
check_expr_with_opt_hint(fcx, *e, flds.map(|fs| fs[i])); let opt_hint = match flds {
Some(ref fs) if i < fs.len() => Some(fs[i]),
_ => None
};
check_expr_with_opt_hint(fcx, *e, opt_hint);
let t = fcx.expr_ty(*e); let t = fcx.expr_ty(*e);
err_field = err_field || ty::type_is_error(t); err_field = err_field || ty::type_is_error(t);
bot_field = bot_field || ty::type_is_bot(t); bot_field = bot_field || ty::type_is_bot(t);