librustc: Fix translation of cross-crate inline or generic methods with explicit self. rs=blocking-snapshot

Author: pcwalton

src/librustc/middle/trans/base.rs

@@ -1644,6 +1644,7 @@ fn trans_fn(ccx: @crate_ctxt,
     let do_time = ccx.sess.trans_stats();
     let start = if do_time { time::get_time() }
                 else { {sec: 0i64, nsec: 0i32} };
+    debug!("trans_fn(ty_self=%?)", ty_self);
     let _icx = ccx.insn_ctxt("trans_fn");
     ccx.stats.n_fns += 1;
     trans_closure(ccx, path, decl, body, llfndecl, ty_self,

src/librustc/middle/trans/inline.rs

@@ -2,8 +2,8 @@ use common::*;
 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_self, get_insn_ctxt};
+use base::{trans_item, get_item_val, self_arg, trans_fn, impl_owned_self,
+           impl_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
@@ -66,15 +66,29 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id,
           csearch::found(ast::ii_method(impl_did, mth)) => {
             ccx.stats.n_inlines += 1;
             ccx.external.insert(fn_id, Some(mth.id));
-            let {bounds: impl_bnds, region_param: _, ty: impl_ty} =
+            let {bounds: impl_bnds, region_param: _, ty: _} =
                 ty::lookup_item_type(ccx.tcx, impl_did);
             if translate && (*impl_bnds).len() + mth.tps.len() == 0u {
                 let llfn = get_item_val(ccx, mth.id);
                 let path = vec::append(
                     ty::item_path(ccx.tcx, impl_did),
                     ~[path_name(mth.ident)]);
-                trans_fn(ccx, path, mth.decl, mth.body,
-                         llfn, impl_self(impl_ty), None, mth.id,
+                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),
+                }
+                trans_fn(ccx,
+                         path,
+                         mth.decl,
+                         mth.body,
+                         llfn,
+                         self_kind,
+                         None,
+                         mth.id,
                          Some(impl_did));
             }
             local_def(mth.id)

src/librustc/middle/trans/meth.rs

@@ -98,6 +98,12 @@ fn trans_method(ccx: @crate_ctxt,
                 ty::subst_tps(ccx.tcx, *tys, None, self_ty)
             }
         };
+        debug!("calling trans_fn with base_self_ty %s, self_ty %s",
+               match base_self_ty {
+                    None => ~"(none)",
+                    Some(x) => ty_to_str(ccx.tcx, x),
+               },
+               ty_to_str(ccx.tcx, self_ty));
         match method.self_ty.node {
           ast::sty_value => {
             impl_owned_self(self_ty)

src/test/auxiliary/explicit_self_xcrate.rs

@@ -0,0 +1,17 @@
+pub trait Foo {
+    #[inline(always)]
+    fn f(&self);
+}
+
+pub struct Bar {
+    x: ~str
+}
+
+impl Bar : Foo {
+    #[inline(always)]
+    fn f(&self) {
+        io::println((*self).x);
+    }
+}
+
+

src/test/run-pass/explicit_self_xcrate_exe.rs

@@ -0,0 +1,11 @@
+// xfail-fast
+// aux-build:explicit_self_xcrate.rs
+
+extern mod explicit_self_xcrate;
+use explicit_self_xcrate::{Foo, Bar};
+
+fn main() {
+    let x = Bar { x: ~"hello" };
+    x.f();
+}
+