diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/trans/meth.rs | 19 | ||||
| -rw-r--r-- | src/test/run-pass/trait-object-generics.rs | 26 |
2 files changed, 37 insertions, 8 deletions
diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs index f4451d9c53f..c0534b89f79 100644 --- a/src/librustc/middle/trans/meth.rs +++ b/src/librustc/middle/trans/meth.rs @@ -577,20 +577,23 @@ fn emit_vtable_methods(bcx: @mut Block, let trait_method_def_ids = ty::trait_method_def_ids(tcx, trt_id); do trait_method_def_ids.map |method_def_id| { - let im = ty::method(tcx, *method_def_id); + let ident = ty::method(tcx, *method_def_id).ident; + // The substitutions we have are on the impl, so we grab + // the method type from the impl to substitute into. + let m_id = method_with_name(ccx, impl_id, ident); + let m = ty::method(tcx, m_id); + debug!("(making impl vtable) emitting method %s at subst %s", + m.repr(tcx), + substs.repr(tcx)); let fty = ty::subst_tps(tcx, substs, None, - ty::mk_bare_fn(tcx, im.fty.clone())); - if im.generics.has_type_params() || ty::type_has_self(fty) { + ty::mk_bare_fn(tcx, m.fty.clone())); + if m.generics.has_type_params() || ty::type_has_self(fty) { debug!("(making impl vtable) method has self or type params: %s", - tcx.sess.str_of(im.ident)); + tcx.sess.str_of(ident)); C_null(Type::nil().ptr_to()) } else { - debug!("(making impl vtable) adding method to vtable: %s", - tcx.sess.str_of(im.ident)); - let m_id = method_with_name(ccx, impl_id, im.ident); - trans_fn_ref_with_vtables(bcx, m_id, 0, substs, Some(vtables)).llfn } diff --git a/src/test/run-pass/trait-object-generics.rs b/src/test/run-pass/trait-object-generics.rs new file mode 100644 index 00000000000..7bee660410d --- /dev/null +++ b/src/test/run-pass/trait-object-generics.rs @@ -0,0 +1,26 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// test for #8601 + +enum Type<T> { Constant } + +trait Trait<K,V> { + fn method(&self,Type<(K,V)>) -> int; +} + +impl<V> Trait<u8,V> for () { + fn method(&self, _x: Type<(u8,V)>) -> int { 0 } +} + +fn main () { + let a = @() as @Trait<u8, u8>; + assert_eq!(a.method(Constant), 0); +} |