---

yaml
---
r: 3809
b: refs/heads/master
c: eef61a5
h: refs/heads/master
i:
  3807: 0ba1e8d
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d774136b62b2df51555a325439126a29038da3
+refs/heads/master: eef61a527d8d08f57df8309d42ba15d15e391a83

trunk/src/lib/ptr.rs

@@ -1,8 +1,10 @@
 // Unsafe pointer utility functions.
 
 native "rust-intrinsic" mod rusti {
+    fn addr_of[T](&T val) -> *T;
     fn ptr_offset[T](*T ptr, uint count) -> *T;
 }
 
+fn addr_of[T](&T val) -> *T { ret rusti::addr_of(val); }
 fn offset[T](*T ptr, uint count) -> *T { ret rusti::ptr_offset(ptr, count); }
 

trunk/src/rt/intrinsics/intrinsics.cpp

@@ -49,3 +49,9 @@ rust_intrinsic_cast(rust_task *task, void *retptr, type_desc *t1,
     memmove(retptr, src, t1->size);
 }
 
+extern "C" void
+rust_intrinsic_addr_of(rust_task *task, void **retptr, type_desc *ty,
+                       void *valptr) {
+    *retptr = valptr;
+}
+

trunk/src/rt/intrinsics/intrinsics.ll.in

@@ -137,6 +137,12 @@ declare void @upcall_fail(%struct.rust_task*, i8*, i8*, i32)
 
 declare void @llvm.memmove.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind
 
+define linkonce_odr void @rust_intrinsic_addr_of(%struct.rust_task* nocapture %task, i8** nocapture %retptr, %struct.type_desc* nocapture %ty, i8* %valptr) nounwind {
+entry:
+  store i8* %valptr, i8** %retptr, align 4, !tbaa !3
+  ret void
+}
+
 !0 = metadata !{metadata !"long", metadata !1}
 !1 = metadata !{metadata !"omnipotent char", metadata !2}
 !2 = metadata !{metadata !"Simple C/C++ TBAA", null}