mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustup

Browse Source
This commit is contained in:
Oliver Schneider 2016-11-17 11:31:28 +01:00
parent 9322dec830
commit a5aafbdfbf
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/interpreter/terminator/mod.rs
View File

@ -5,7 +5,6 @@ use rustc::ty::fold::TypeFoldable;
use rustc::ty::layout::Layout;
use rustc::ty::subst::{Substs, Kind};
use rustc::ty::{self, Ty, TyCtxt, BareFnTy};
use std::rc::Rc;
use syntax::codemap::{DUMMY_SP, Span};
use syntax::{ast, attr};
@ -479,7 +478,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
_ => bug!("cannot convert {:?} to {:?}", closure_kind, trait_closure_kind),
}
Ok((vtable_closure.closure_def_id, vtable_closure.substs.func_substs))
Ok((vtable_closure.closure_def_id, vtable_closure.substs.substs))
}
traits::VtableFnPointer(vtable_fn_ptr) => {
@ -715,7 +714,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
#[derive(Debug)]
pub(super) struct ImplMethod<'tcx> {
pub(super) method: Rc<ty::Method<'tcx>>,
pub(super) method: ty::AssociatedItem,
pub(super) substs: &'tcx Substs<'tcx>,
pub(super) is_provided: bool,
}
@ -733,7 +732,7 @@ pub(super) fn get_impl_method<'a, 'tcx>(
let trait_def_id = tcx.trait_id_of_impl(impl_def_id).unwrap();
let trait_def = tcx.lookup_trait_def(trait_def_id);
match trait_def.ancestors(impl_def_id).fn_defs(tcx, name).next() {
match trait_def.ancestors(impl_def_id).defs(tcx, name, ty::AssociatedKind::Method).next() {
Some(node_item) => {
let substs = tcx.infer_ctxt(None, None, Reveal::All).enter(|infcx| {
let substs = substs.rebase_onto(tcx, trait_def_id, impl_substs);
@ -770,7 +769,7 @@ pub fn find_method<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
let trait_def_id = tcx.trait_id_of_impl(impl_def_id).unwrap();
let trait_def = tcx.lookup_trait_def(trait_def_id);
match trait_def.ancestors(impl_def_id).fn_defs(tcx, name).next() {
match trait_def.ancestors(impl_def_id).defs(tcx, name, ty::AssociatedKind::Method).next() {
Some(node_item) => {
let substs = tcx.infer_ctxt(None, None, Reveal::All).enter(|infcx| {
let substs = substs.rebase_onto(tcx, trait_def_id, impl_substs);

37
src/interpreter/vtable.rs
View File

@ -1,6 +1,6 @@
use rustc::hir::def_id::DefId;
use rustc::traits::{self, Reveal, SelectionContext};
use rustc::ty::subst::{Substs, Subst};
use rustc::ty::subst::Substs;
use rustc::ty;
use super::EvalContext;
@ -35,7 +35,12 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
self.get_vtable_methods(id, substs)
.into_iter()
.map(|opt_mth| opt_mth.map(|mth| {
let fn_ty = self.tcx.erase_regions(&mth.method.fty);
let fn_ty = self.tcx.item_type(mth.method.def_id);
let fn_ty = match fn_ty.sty {
ty::TyFnDef(_, _, fn_ty) => fn_ty,
_ => bug!("bad function type: {}", fn_ty),
};
let fn_ty = self.tcx.erase_regions(&fn_ty);
self.memory.create_fn_ptr(self.tcx, mth.method.def_id, mth.substs, fn_ty)
}))
.collect::<Vec<_>>()
@ -85,8 +90,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
self.memory.write_usize(vtable, 0)?;
if let ty::TyAdt(adt_def, substs) = trait_ref.self_ty().sty {
if let Some(drop_def_id) = adt_def.destructor() {
let ty_scheme = self.tcx.lookup_item_type(drop_def_id);
let fn_ty = match ty_scheme.ty.sty {
let fn_ty = match self.tcx.item_type(drop_def_id).sty {
ty::TyFnDef(_, _, fn_ty) => self.tcx.erase_regions(&fn_ty),
_ => bug!("drop method is not a TyFnDef"),
};
@ -120,18 +124,15 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
self.tcx.populate_implementations_for_trait_if_necessary(trait_id);
let trait_item_def_ids = self.tcx.impl_or_trait_items(trait_id);
trait_item_def_ids
.iter()
self.tcx
.associated_items(trait_id)
// Filter out non-method items.
.filter_map(|&trait_method_def_id| {
let trait_method_type = match self.tcx.impl_or_trait_item(trait_method_def_id) {
ty::MethodTraitItem(trait_method_type) => trait_method_type,
_ => return None,
};
debug!("get_vtable_methods: trait_method_def_id={:?}",
trait_method_def_id);
.filter_map(|trait_method_type| {
if trait_method_type.kind != ty::AssociatedKind::Method {
return None;
}
debug!("get_vtable_methods: trait_method_type={:?}",
trait_method_type);
let name = trait_method_type.name;
@ -146,7 +147,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
// the method may have some early-bound lifetimes, add
// regions for those
let method_substs = Substs::for_item(self.tcx, trait_method_def_id,
let method_substs = Substs::for_item(self.tcx, trait_method_type.def_id,
|_, _| self.tcx.mk_region(ty::ReErased),
|_, _| self.tcx.types.err);
@ -162,8 +163,8 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
// method could then never be called, so we do not want to
// try and trans it, in that case. Issue #23435.
if mth.is_provided {
let predicates = mth.method.predicates.predicates.subst(self.tcx, mth.substs);
if !self.normalize_and_test_predicates(predicates) {
let predicates = self.tcx.item_predicates(trait_method_type.def_id).instantiate_own(self.tcx, mth.substs);
if !self.normalize_and_test_predicates(predicates.predicates) {
debug!("get_vtable_methods: predicates do not hold");
return Some(None);
}

2
src/memory.rs
View File

@ -144,7 +144,7 @@ impl<'a, 'tcx> Memory<'a, 'tcx> {
});
self.create_fn_alloc(FunctionDefinition {
def_id: def_id,
substs: substs.func_substs,
substs: substs.substs,
abi: fn_ty.abi,
// FIXME: why doesn't this compile?
//sig: tcx.erase_late_bound_regions(&fn_ty.sig),