---

pcwalton · pcwalton · commit 5a0db1011d7f · 2012-03-13T11:26:55.000-07:00
yaml --- r: 14816 b: refs/heads/try c: ec340c8 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: cd72b1f8481552effb639024494ae4aa4a521fb8
+refs/heads/try: ec340c8f40aef3d98e30d22211550b8efa5ed1e0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rustc/middle/typeck.rs b/branches/try/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) {`