Skip to content

Commit 1c1e760

Browse files
xen0nalexcrichton
authored andcommitted
trans: callee: normalize trait_ref before use
Fixes rust-lang#33436 and rust-lang#33461. Test case is from rust-lang#33461.
1 parent 3369382 commit 1c1e760

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

src/librustc_trans/callee.rs

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ impl<'tcx> Callee<'tcx> {
156156
let method_item = tcx.impl_or_trait_item(def_id);
157157
let trait_id = method_item.container().id();
158158
let trait_ref = ty::Binder(substs.to_trait_ref(tcx, trait_id));
159+
let trait_ref = infer::normalize_associated_type(tcx, &trait_ref);
159160
match common::fulfill_obligation(ccx, DUMMY_SP, trait_ref) {
160161
traits::VtableImpl(vtable_impl) => {
161162
let impl_did = vtable_impl.impl_def_id;

src/test/run-pass/issue-33461.rs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use std::marker::PhantomData;
12+
13+
struct TheType<T> {
14+
t: PhantomData<T>
15+
}
16+
17+
pub trait TheTrait {
18+
type TheAssociatedType;
19+
}
20+
21+
impl TheTrait for () {
22+
type TheAssociatedType = ();
23+
}
24+
25+
pub trait Shape<P: TheTrait> {
26+
fn doit(&self) {
27+
}
28+
}
29+
30+
impl<P: TheTrait> Shape<P> for TheType<P::TheAssociatedType> {
31+
}
32+
33+
fn main() {
34+
let ball = TheType { t: PhantomData };
35+
let handle: &Shape<()> = &ball;
36+
}

0 commit comments

Comments
 (0)