---

yaml
---
r: 14288
b: refs/heads/try
c: c4c89dd
h: refs/heads/master
v: v3

Author: brson

[refs]

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

branches/try/src/comp/middle/trans/base.rs

@@ -2338,6 +2338,19 @@ fn lval_static_fn(bcx: @block_ctxt, fn_id: ast::def_id, id: ast::node_id,
         // External reference.
         trans_external_path(bcx, fn_id, tpt)
     };
+
+    // FIXME: Need to support external crust functions
+    if fn_id.crate == ast::local_crate {
+        alt bcx_tcx(bcx).def_map.find(id) {
+          some(ast::def_fn(_, ast::crust_fn)) {
+            // Crust functions are just opaque pointers
+            let val = PointerCast(bcx, val, T_ptr(T_i8()));
+            ret lval_no_env(bcx, val, owned_imm);
+          }
+          _ { }
+        }
+    }
+
     let gen = generic_none, bcx = bcx;
     if tys.len() > 0u {
         let tydescs = [], tis = [];

branches/try/src/test/run-pass/crust-take-value.rs

@@ -1,7 +1,15 @@
 crust fn f() {
 }
 
+crust fn g() {
+}
+
 fn main() {
     // Crust functions are *u8 types
-    let _x: *u8 = f;
-}
+    let a: *u8 = f;
+    let b: *u8 = f;
+    let c: *u8 = g;
+
+    assert a == b;
+    assert a != c;
+}