---

pcwalton · pcwalton · commit 8cedf827129e · 2012-03-08T14:55:51.000-08:00
yaml --- r: 14718 b: refs/heads/try c: fcde161 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: d048a00cf3c275d9f9974960d0db463844da898e
+refs/heads/try: fcde161f4f9b686a790da52653a0a810bf09d487
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rustc/middle/typeck.rs b/branches/try/src/rustc/middle/typeck.rs
@@ -2192,7 +2192,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
             }
           }
           ast::addr_of {
-            tcx.sess.bug("TODO pcwalton");
+            // FIXME: This is incorrect. Infer the proper region.
+            let tm = { ty: oper_t, mutbl: ast::m_imm };
+            oper_t = ty::mk_rptr(tcx, ty::re_block(0), tm);
           }
         }
         write_ty(tcx, id, oper_t);

Original file line number	Diff line number	Diff line change
`@@ -2192,7 +2192,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,`
`2192`	`2192`	`}`
`2193`	`2193`	`}`
`2194`	`2194`	`ast::addr_of {`
`2195`		`- tcx.sess.bug("TODO pcwalton");`
	`2195`	`+ // FIXME: This is incorrect. Infer the proper region.`
	`2196`	`+ let tm = { ty: oper_t, mutbl: ast::m_imm };`
	`2197`	`+ oper_t = ty::mk_rptr(tcx, ty::re_block(0), tm);`
`2196`	`2198`	`}`
`2197`	`2199`	`}`
`2198`	`2200`	`write_ty(tcx, id, oper_t);`