Skip to content

Commit

Permalink
trans: callee: normalize trait_ref before use
Browse files Browse the repository at this point in the history
Fixes #33436 and #33461. Test case is from #33461.
  • Loading branch information
xen0n committed May 7, 2016
1 parent b071c1f commit dcdf761
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/librustc_trans/callee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ impl<'tcx> Callee<'tcx> {
let method_item = tcx.impl_or_trait_item(def_id);
let trait_id = method_item.container().id();
let trait_ref = ty::Binder(substs.to_trait_ref(tcx, trait_id));
let trait_ref = infer::normalize_associated_type(tcx, &trait_ref);
match common::fulfill_obligation(ccx, DUMMY_SP, trait_ref) {
traits::VtableImpl(vtable_impl) => {
let impl_did = vtable_impl.impl_def_id;
Expand Down
36 changes: 36 additions & 0 deletions src/test/run-pass/issue-33461.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2016 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.

use std::marker::PhantomData;

struct TheType<T> {
t: PhantomData<T>
}

pub trait TheTrait {
type TheAssociatedType;
}

impl TheTrait for () {
type TheAssociatedType = ();
}

pub trait Shape<P: TheTrait> {
fn doit(&self) {
}
}

impl<P: TheTrait> Shape<P> for TheType<P::TheAssociatedType> {
}

fn main() {
let ball = TheType { t: PhantomData };
let handle: &Shape<()> = &ball;
}

0 comments on commit dcdf761

Please sign in to comment.