---

yaml
---
r: 85501
b: refs/heads/dist-snap
c: 29ab2da
h: refs/heads/master
i:
  85499: 3d24669
v: v3

Author: bytwise

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: a1066130c07b864a1612c49b4b84dc34d5f113a1
+refs/heads/dist-snap: 29ab2daa5efebb59b5ad4a2710d570e89696e583
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/callee.rs

@@ -132,7 +132,6 @@ pub fn trans(bcx: @mut Block, expr: @ast::expr) -> Callee {
             ast::def_struct(def_id) => {
                 fn_callee(bcx, trans_fn_ref(bcx, def_id, ref_expr.id))
             }
-            ast::def_static(*) |
             ast::def_arg(*) |
             ast::def_local(*) |
             ast::def_binding(*) |
@@ -141,7 +140,7 @@ pub fn trans(bcx: @mut Block, expr: @ast::expr) -> Callee {
                 datum_callee(bcx, ref_expr)
             }
             ast::def_mod(*) | ast::def_foreign_mod(*) | ast::def_trait(*) |
-            ast::def_ty(*) | ast::def_prim_ty(*) |
+            ast::def_static(*) | ast::def_ty(*) | ast::def_prim_ty(*) |
             ast::def_use(*) | ast::def_typaram_binder(*) |
             ast::def_region(*) | ast::def_label(*) | ast::def_ty_param(*) |
             ast::def_self_ty(*) | ast::def_method(*) => {

branches/dist-snap/src/librustc/middle/trans/expr.rs

@@ -795,14 +795,18 @@ fn trans_def_dps_unadjusted(bcx: @mut Block, ref_expr: &ast::expr,
                 return bcx;
             }
         }
-        ast::def_struct(*) => {
+        ast::def_struct(def_id) => {
             let ty = expr_ty(bcx, ref_expr);
             match ty::get(ty).sty {
                 ty::ty_struct(did, _) if ty::has_dtor(ccx.tcx, did) => {
                     let repr = adt::represent_type(ccx, ty);
                     adt::trans_start_init(bcx, repr, lldest, 0);
                 }
-                _ => {}
+                ty::ty_bare_fn(*) => {
+                    let fn_data = callee::trans_fn_ref(bcx, def_id, ref_expr.id);
+                    Store(bcx, fn_data.llfn, lldest);
+                }
+                _ => ()
             }
             return bcx;
         }

branches/dist-snap/src/test/run-pass/static-function-pointer.rs renamed to branches/dist-snap/src/test/run-pass/tuple-struct-constructor-pointer.rs

@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f(x: int) -> int { x }
-
-static F: extern fn(int) -> int = f;
-static mut G: extern fn(int) -> int = f;
+#[deriving(Eq)]
+struct Foo(int);
+#[deriving(Eq)]
+struct Bar(int, int);
 
 fn main() {
-    F(42);
-    unsafe { G(7); }
+    let f: extern fn(int) -> Foo = Foo;
+    let g: extern fn(int, int) -> Bar = Bar;
+    assert_eq!(f(42), Foo(42));
+    assert_eq!(g(4, 7), Bar(4, 7));
 }