about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2012-03-13 11:25:49 -0700
committerPatrick Walton <pcwalton@mimiga.net>2012-03-13 11:26:55 -0700
commitec340c8f40aef3d98e30d22211550b8efa5ed1e0 (patch)
tree463b4c87bf2bb2dd4282fc62b3953d3e53945705
parentcd72b1f8481552effb639024494ae4aa4a521fb8 (diff)
downloadrust-ec340c8f40aef3d98e30d22211550b8efa5ed1e0.tar.gz
rust-ec340c8f40aef3d98e30d22211550b8efa5ed1e0.zip
rustc: Look up inferred regions in ast_ty_to_ty
-rw-r--r--src/rustc/middle/typeck.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rustc/middle/typeck.rs b/src/rustc/middle/typeck.rs
index 1b8cd8b7117..8ff7706f68c 100644
--- 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) {