---

yaml
---
r: 33941
b: refs/heads/snap-stage3
c: 4f3cc01
h: refs/heads/master
i:
  33939: 3f06722
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5bf9e6f58be43957b3e79f47b3020667a81630ef
+refs/heads/snap-stage3: 4f3cc01487ff4c49f6a72725ae47533da06835db
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/inline.rs

@@ -13,7 +13,7 @@ use syntax::ast;
 use syntax::ast_util::local_def;
 use syntax::ast_map::{path, path_mod, path_name};
 use base::{trans_item, get_item_val, self_arg, trans_fn, impl_owned_self,
-           impl_self, get_insn_ctxt};
+           impl_self, no_self, get_insn_ctxt};
 
 // `translate` will be true if this function is allowed to translate the
 // item and false otherwise. Currently, this parameter is set to false when
@@ -83,14 +83,18 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id,
                 let path = vec::append(
                     ty::item_path(ccx.tcx, impl_did),
                     ~[path_name(mth.ident)]);
-                let self_ty = ty::node_id_to_type(ccx.tcx, mth.self_id);
-                debug!("calling inline trans_fn with self_ty %s",
-                       ty_to_str(ccx.tcx, self_ty));
-                let self_kind;
-                match mth.self_ty.node {
-                    ast::sty_value => self_kind = impl_owned_self(self_ty),
-                    _ => self_kind = impl_self(self_ty),
-                }
+                let self_kind = match mth.self_ty.node {
+                    ast::sty_static => no_self,
+                    _ => {
+                        let self_ty = ty::node_id_to_type(ccx.tcx, mth.self_id);
+                        debug!("calling inline trans_fn with self_ty %s",
+                               ty_to_str(ccx.tcx, self_ty));
+                        match mth.self_ty.node {
+                            ast::sty_value => impl_owned_self(self_ty),
+                            _ => impl_self(self_ty),
+                        }
+                    }
+                };
                 trans_fn(ccx,
                          path,
                          mth.decl,

branches/snap-stage3/src/test/auxiliary/static_fn_inline_xc_aux.rs

@@ -0,0 +1,14 @@
+
+pub mod num {
+    pub trait Num2 {
+        static pure fn from_int2(n: int) -> self;
+    }
+}
+
+pub mod float {
+    impl float: num::Num2 {
+        #[inline]
+        static pure fn from_int2(n: int) -> float { return n as float;  }
+    }
+}
+

branches/snap-stage3/src/test/run-pass/static-fn-inline-xc.rs

@@ -0,0 +1,9 @@
+// aux-build:static_fn_inline_xc_aux.rs
+
+extern mod mycore(name ="static_fn_inline_xc_aux");
+
+use mycore::num;
+
+fn main() {
+    let _1:float = num::from_int2(1i);
+}