---

yaml
---
r: 23646
b: refs/heads/master
c: b999973
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a02ab41b65927c39e912ea820b5dff5032ad5695
+refs/heads/master: b999973c0ffa86738daab277cd6e985248ef08aa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/trans/foreign.rs

@@ -993,6 +993,16 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::foreign_item,
                                    lv_temporary),
                                arg_vals(~[frameaddress_val]), ignore);
       }
+      ~"morestack_addr" => {
+        // XXX This is a hack to grab the address of this particular
+        // native function. There should be a general in-language
+        // way to do this
+        let llfty = type_of_fn(bcx.ccx(), ~[], ty::mk_nil(bcx.tcx()));
+        let morestack_addr = decl_cdecl_fn(
+            bcx.ccx().llmod, ~"__morestack", llfty);
+        let morestack_addr = PointerCast(bcx, morestack_addr, T_ptr(T_nil()));
+        Store(bcx, morestack_addr, fcx.llretptr);
+      }
       _ => {
       // Could we make this an enum rather than a string? does it get
       // checked earlier?

trunk/src/rustc/middle/typeck/check.rs

@@ -2590,6 +2590,9 @@ fn check_intrinsic_type(ccx: @crate_ctxt, it: @ast::foreign_item) {
         });
         (0u, ~[arg(ast::by_ref, fty)], ty::mk_nil(tcx))
       }
+      ~"morestack_addr" => {
+        (0u, ~[], ty::mk_nil_ptr(tcx))
+      }
       other => {
         tcx.sess.span_err(it.span, ~"unrecognized intrinsic function: `" +
                           other + ~"`");

trunk/src/test/run-pass/morestack-address.rs

@@ -0,0 +1,11 @@
+#[nolink]
+#[abi = "rust-intrinsic"]
+extern mod rusti {
+    fn morestack_addr() -> *();
+}
+
+fn main() {
+    let addr = rusti::morestack_addr();
+    assert addr.is_not_null();
+    error!("%?", addr);
+}