rustc: Look up inferred regions in ast_ty_to_ty

pcwalton · pcwalton · commit ec340c8f40ae · 2012-03-13T11:26:55.000-07:00
diff --git a/src/rustc/middle/typeck.rs b/src/rustc/middle/typeck.rs
@@ -320,7 +320,12 @@ fn ast_ty_to_ty(tcx: ty::ctxt, mode: mode, &&ast_ty: @ast::ty) -> ty::t {
         ty::mk_ptr(tcx, ast_mt_to_mt(tcx, mode, mt))
       }
       ast::ty_rptr(region, mt) {
-        let region = tcx.region_map.ast_type_to_region.get(region.id);
+        let region = alt region.node {
+            ast::re_inferred {
+                tcx.region_map.ast_type_to_inferred_region.get(ast_ty.id)
+            }
+            _ { tcx.region_map.ast_type_to_region.get(region.id) }
+        };
         ty::mk_rptr(tcx, region, ast_mt_to_mt(tcx, mode, mt))
       }
       ast::ty_tup(fields) {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,12 @@ fn ast_ty_to_ty(tcx: ty::ctxt, mode: mode, &&ast_ty: @ast::ty) -> ty::t {`
`320`	`320`	`ty::mk_ptr(tcx, ast_mt_to_mt(tcx, mode, mt))`
`321`	`321`	`}`
`322`	`322`	`ast::ty_rptr(region, mt) {`
`323`		`- let region = tcx.region_map.ast_type_to_region.get(region.id);`
	`323`	`+ let region = alt region.node {`
	`324`	`+ ast::re_inferred {`
	`325`	`+ tcx.region_map.ast_type_to_inferred_region.get(ast_ty.id)`
	`326`	`+ }`
	`327`	`+ _ { tcx.region_map.ast_type_to_region.get(region.id) }`
	`328`	`+ };`
`324`	`329`	`ty::mk_rptr(tcx, region, ast_mt_to_mt(tcx, mode, mt))`
`325`	`330`	`}`
`326`	`331`	`ast::ty_tup(fields) {`