From fbc2e92caa63674520edc53c7cb8f49df77b81a8 Mon Sep 17 00:00:00 2001 From: Brian Koropoff Date: Sat, 8 Nov 2014 11:01:06 -0800 Subject: [PATCH] Fix handling of for loop patterns in regionck When establishing region links within a pattern, use the mem-cat of the type the pattern matches against (that is, the result of `iter.next()`) rather than that of the iterator type. Closes #17068 Closes #18767 --- src/librustc/middle/typeck/check/regionck.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs index 014180a11553..d47d5649c656 100644 --- a/src/librustc/middle/typeck/check/regionck.rs +++ b/src/librustc/middle/typeck/check/regionck.rs @@ -770,8 +770,12 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) { { let mc = mc::MemCategorizationContext::new(rcx); - let head_cmt = ignore_err!(mc.cat_expr(&**head)); - link_pattern(rcx, mc, head_cmt, &**pat); + let pat_ty = rcx.resolve_node_type(pat.id); + let pat_cmt = mc.cat_rvalue(pat.id, + pat.span, + ty::ReScope(body.id), + pat_ty); + link_pattern(rcx, mc, pat_cmt, &**pat); } rcx.visit_expr(&**head);