Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fold MethodOrigins to resolve inference variables they may contain. #17663

Merged
merged 1 commit into from
Oct 2, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/librustc/middle/ty_fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,33 @@ impl TypeFoldable for ty::AutoRef {
}
}

impl TypeFoldable for typeck::MethodOrigin {
fn fold_with<'tcx, F: TypeFolder<'tcx>>(&self, folder: &mut F) -> typeck::MethodOrigin {
match *self {
typeck::MethodStatic(def_id) => {
typeck::MethodStatic(def_id)
}
typeck::MethodStaticUnboxedClosure(def_id) => {
typeck::MethodStaticUnboxedClosure(def_id)
}
typeck::MethodTypeParam(ref param) => {
typeck::MethodTypeParam(typeck::MethodParam {
trait_ref: param.trait_ref.fold_with(folder),
method_num: param.method_num
})
}
typeck::MethodTraitObject(ref object) => {
typeck::MethodTraitObject(typeck::MethodObject {
trait_ref: object.trait_ref.fold_with(folder),
object_trait_id: object.object_trait_id,
method_num: object.method_num,
real_index: object.real_index
})
}
}
}
}

impl TypeFoldable for typeck::vtable_origin {
fn fold_with<'tcx, F: TypeFolder<'tcx>>(&self, folder: &mut F) -> typeck::vtable_origin {
match *self {
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/check/writeback.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
method_call,
method.repr(self.tcx()));
let new_method = MethodCallee {
origin: method.origin,
origin: self.resolve(&method.origin, reason),
ty: self.resolve(&method.ty, reason),
substs: self.resolve(&method.substs, reason),
};
Expand Down
22 changes: 22 additions & 0 deletions src/test/auxiliary/issue-17662.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// 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.

#![crate_type = "lib"]

pub trait Foo<'a, T> {
fn foo(&self) -> T;
}

pub fn foo<'a, T>(x: &'a Foo<'a, T>) -> T {
let x: &'a Foo<T> = x;
// ^ the lifetime parameter of Foo is left to be infered.
x.foo()
// ^ encoding this method call in metadata triggers an ICE.
}
23 changes: 23 additions & 0 deletions src/test/run-pass/issue-17662.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// 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.

// aux-build:issue-17662.rs

extern crate "issue-17662" as i;

struct Bar<'a>;

impl<'a> i::Foo<'a, uint> for Bar<'a> {
fn foo(&self) -> uint { 5u }
}

pub fn main() {
assert_eq!(i::foo(&Bar), 5);
}