---

yaml
---
r: 15621
b: refs/heads/try
c: b04b415
h: refs/heads/master
i:
  15619: 688f49b
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 7d05bea7b90a6963b48f761390fc6bc7ae2bb527
+refs/heads/try: b04b415e0d6c8b069fd2ee9ed2b5aba097413229
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/metadata/astencode.rs

@@ -844,6 +844,12 @@ fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
             }
         }
     }
+
+    option::iter(tcx.borrowings.find(id)) {|_i|
+        ebml_w.tag(c::tag_table_borrowings) {||
+            ebml_w.id(id);
+        }
+    }
 }
 
 impl decoder for ebml::doc {
@@ -914,6 +920,8 @@ fn decode_side_tables(xcx: extended_decode_ctxt,
             dcx.maps.copy_map.insert(id, ());
         } else if tag == (c::tag_table_spill as uint) {
             dcx.maps.spill_map.insert(id, ());
+        } else if tag == (c::tag_table_borrowings as uint) {
+            dcx.tcx.borrowings.insert(id, ());
         } else {
             let val_doc = entry_doc[c::tag_table_val];
             let val_dsr = ebml::ebml_deserializer(val_doc);

branches/try/src/rustc/metadata/common.rs

@@ -109,7 +109,8 @@ enum astencode_tag { // Reserves 0x50 -- 0x6f
     tag_table_last_use,
     tag_table_spill,
     tag_table_method_map,
-    tag_table_vtable_map
+    tag_table_vtable_map,
+    tag_table_borrowings
 }
 
 // djb's cdb hashes.

branches/try/src/rustc/metadata/tydecode.rs

@@ -307,6 +307,11 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
       '@' { ret ty::mk_box(st.tcx, parse_mt(st, conv)); }
       '~' { ret ty::mk_uniq(st.tcx, parse_mt(st, conv)); }
       '*' { ret ty::mk_ptr(st.tcx, parse_mt(st, conv)); }
+      '&' {
+        let r = parse_region(st);
+        let mt = parse_mt(st, conv);
+        ret ty::mk_rptr(st.tcx, r, mt);
+      }
       'I' { ret ty::mk_vec(st.tcx, parse_mt(st, conv)); }
       'V' {
         let mt = parse_mt(st, conv);

branches/try/src/test/auxiliary/cci_borrow_lib.rs

@@ -0,0 +1,3 @@
+fn foo(x: &uint) -> uint {
+    *x
+}

branches/try/src/test/run-pass/cci_borrow.rs

@@ -0,0 +1,12 @@
+// xfail-fast - check-fast doesn't understand aux-build
+// aux-build:cci_borrow_lib.rs
+
+use cci_borrow_lib;
+import cci_borrow_lib::foo;
+
+fn main() {
+    let p = @22u;
+    let r = foo(p);
+    #debug["r=%u", r];
+    assert r == 22u;
+}