Skip to content

Commit

Permalink
Remove unnecessary substitution of type params when generating
Browse files Browse the repository at this point in the history
vtable methods before translating the ref to the method itself.
  • Loading branch information
rcatolino committed Jan 7, 2014
1 parent bc395bc commit 1812a7b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/librustc/middle/trans/meth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -630,11 +630,8 @@ fn emit_vtable_methods(bcx: @Block,
debug!("(making impl vtable) emitting method {} at subst {}",
m.repr(tcx),
substs.repr(tcx));
let fty = ty::subst_tps(tcx,
substs,
None,
ty::mk_bare_fn(tcx, m.fty.clone()));
if m.generics.has_type_params() || ty::type_has_self(fty) {
if m.generics.has_type_params() ||
ty::type_has_self(ty::mk_bare_fn(tcx, m.fty.clone())) {
debug!("(making impl vtable) method has self or type params: {}",
tcx.sess.str_of(ident));
C_null(Type::nil().ptr_to())
Expand Down
30 changes: 30 additions & 0 deletions src/test/run-pass/trait-cast-generic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2014 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.

// Testing casting of a generic Struct to a Trait with a generic method.
// This is test for issue 10955.
#[allow(unused_variable)];

trait Foo {
fn f<A>(a: A) -> A {
a
}
}

struct Bar<T> {
x: T,
}

impl<T> Foo for Bar<T> { }

pub fn main() {
let a = Bar { x: 1 };
let b = &a as &Foo;
}

9 comments on commit 1812a7b

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at rcatolino@1812a7b

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging rcatolino/rust/ice-10955 = 1812a7b into auto

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rcatolino/rust/ice-10955 = 1812a7b merged ok, testing candidate = 93b40283

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at rcatolino@1812a7b

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging rcatolino/rust/ice-10955 = 1812a7b into auto

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rcatolino/rust/ice-10955 = 1812a7b merged ok, testing candidate = ebc079c

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 1812a7b Jan 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ebc079c

Please sign in to comment.