use rustc::hir::map as hir_map;
use rustc::hir::def_id::DefId;
-use rustc::middle::lang_items::{BoxFreeFnLangItem, ExchangeMallocFnLangItem};
+use rustc::middle::lang_items::{ExchangeMallocFnLangItem};
use rustc::traits;
-use rustc::ty::subst::{Kind, Substs, Subst};
+use rustc::ty::subst::{Substs, Subst};
use rustc::ty::{self, TypeFoldable, TyCtxt};
use rustc::ty::adjustment::CustomCoerceUnsized;
use rustc::mir::{self, Location};
-use rustc::mir::visit as mir_visit;
use rustc::mir::visit::Visitor as MirVisitor;
-use syntax::abi::Abi;
-use syntax_pos::DUMMY_SP;
-use base::custom_coerce_unsize_info;
-use callee::needs_fn_once_adapter_shim;
use context::SharedCrateContext;
-use common::{def_ty, find_method, instance_ty, fulfill_obligation};
-use glue::{self, DropGlueKind};
+use common::{def_ty, instance_ty};
use monomorphize::{self, Instance};
use util::nodemap::{FxHashSet, FxHashMap, DefIdMap};
use trans_item::{TransItem, DefPathBasedNames, InstantiationMode};
-use std::iter;
-
#[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
pub enum TransItemCollectionMode {
Eager,
let recursion_depth_reset;
match starting_point {
- TransItem::DropGlue(t) => {
- find_drop_glue_neighbors(scx, t, &mut neighbors);
- recursion_depth_reset = None;
- }
TransItem::Static(node_id) => {
let def_id = scx.tcx().hir.local_def_id(node_id);
let instance = Instance::mono(scx.tcx(), def_id);
debug_assert!(should_trans_locally(scx.tcx(), &instance));
let ty = instance_ty(scx, &instance);
- let ty = glue::get_drop_glue_type(scx, ty);
- neighbors.push(TransItem::DropGlue(DropGlueKind::Ty(ty)));
+ visit_drop_use(scx, ty, true, &mut neighbors);
recursion_depth_reset = None;
collect_neighbours(scx, instance, &mut neighbors);
}
+ TransItem::GlobalAsm(..) => {
+ recursion_depth_reset = None;
+ }
}
record_inlining_canditates(scx.tcx(), starting_point, &neighbors[..], inlining_map);
let recursion_depth = recursion_depths.get(&def_id).cloned().unwrap_or(0);
debug!(" => recursion depth={}", recursion_depth);
+ let recursion_depth = if Some(def_id) == tcx.lang_items.drop_in_place_fn() {
+ // HACK: drop_in_place creates tight monomorphization loops. Give
+ // it more margin.
+ recursion_depth / 4
+ } else {
+ recursion_depth
+ };
+
// Code that needs to instantiate the same function recursively
// more than the recursion limit is assumed to be causing an
// infinite expansion.
self.output);
}
}
+ mir::Rvalue::Cast(mir::CastKind::ReifyFnPointer, ref operand, _) => {
+ let fn_ty = operand.ty(self.mir, self.scx.tcx());
+ let fn_ty = monomorphize::apply_param_substs(
+ self.scx,
+ self.param_substs,
+ &fn_ty);
+ visit_fn_use(self.scx, fn_ty, false, &mut self.output);
+ }
mir::Rvalue::Cast(mir::CastKind::ClosureFnPointer, ref operand, _) => {
let source_ty = operand.ty(self.mir, self.scx.tcx());
match source_ty.sty {
ty::TyClosure(def_id, substs) => {
- let substs = monomorphize::apply_param_substs(
- self.scx, self.param_substs, &substs.substs);
- self.output.push(create_fn_trans_item(
- Instance::new(def_id, substs)
- ));
+ let instance = monomorphize::resolve_closure(
+ self.scx, def_id, substs, ty::ClosureKind::FnOnce);
+ self.output.push(create_fn_trans_item(instance));
}
_ => bug!(),
}
self.super_rvalue(rvalue, location);
}
- fn visit_lvalue(&mut self,
- lvalue: &mir::Lvalue<'tcx>,
- context: mir_visit::LvalueContext<'tcx>,
- location: Location) {
- debug!("visiting lvalue {:?}", *lvalue);
-
- if let mir_visit::LvalueContext::Drop = context {
- let ty = lvalue.ty(self.mir, self.scx.tcx())
- .to_ty(self.scx.tcx());
-
- let ty = monomorphize::apply_param_substs(self.scx,
- self.param_substs,
- &ty);
- assert!(ty.is_normalized_for_trans());
- let ty = glue::get_drop_glue_type(self.scx, ty);
- self.output.push(TransItem::DropGlue(DropGlueKind::Ty(ty)));
- }
-
- self.super_lvalue(lvalue, context, location);
- }
-
- fn visit_operand(&mut self, operand: &mir::Operand<'tcx>, location: Location) {
- debug!("visiting operand {:?}", *operand);
-
- let callee = match *operand {
- mir::Operand::Constant(ref constant) => {
- if let ty::TyFnDef(def_id, substs, _) = constant.ty.sty {
- // This is something that can act as a callee, proceed
- Some((def_id, substs))
- } else {
- // This is not a callee, but we still have to look for
- // references to `const` items
- if let mir::Literal::Item { def_id, substs } = constant.literal {
- let substs = monomorphize::apply_param_substs(self.scx,
- self.param_substs,
- &substs);
- let instance = monomorphize::resolve_const(self.scx, def_id, substs);
- collect_neighbours(self.scx, instance, self.output);
- }
-
- None
- }
- }
- _ => None
- };
-
- if let Some((callee_def_id, callee_substs)) = callee {
- debug!(" => operand is callable");
-
- // `callee_def_id` might refer to a trait method instead of a
- // concrete implementation, so we have to find the actual
- // implementation. For example, the call might look like
- //
- // std::cmp::partial_cmp(0i32, 1i32)
- //
- // Calling do_static_dispatch() here will map the def_id of
- // `std::cmp::partial_cmp` to the def_id of `i32::partial_cmp<i32>`
+ fn visit_constant(&mut self, constant: &mir::Constant<'tcx>, location: Location) {
+ debug!("visiting constant {:?} @ {:?}", *constant, location);
- let callee_substs = monomorphize::apply_param_substs(self.scx,
- self.param_substs,
- &callee_substs);
- let dispatched = do_static_dispatch(self.scx,
- callee_def_id,
- callee_substs);
-
- if let StaticDispatchResult::Dispatched {
- instance, fn_once_adjustment
- } = dispatched {
- // if we have a concrete impl (which we might not have
- // in the case of something compiler generated like an
- // object shim or a closure that is handled differently),
- // we check if the callee is something that will actually
- // result in a translation item ...
- if should_trans_locally(self.scx.tcx(), &instance) {
- self.output.push(create_fn_trans_item(instance));
+ if let ty::TyFnDef(..) = constant.ty.sty {
+ // function definitions are zero-sized, and only generate
+ // IR when they are called/reified.
+ self.super_constant(constant, location);
+ return
+ }
- // This call will instantiate an FnOnce adapter, which drops
- // the closure environment. Therefore we need to make sure
- // that we collect the drop-glue for the environment type.
- if let Some(env_ty) = fn_once_adjustment {
- let env_ty = glue::get_drop_glue_type(self.scx, env_ty);
- if self.scx.type_needs_drop(env_ty) {
- let dg = DropGlueKind::Ty(env_ty);
- self.output.push(TransItem::DropGlue(dg));
- }
- }
- }
- }
+ if let mir::Literal::Item { def_id, substs } = constant.literal {
+ let substs = monomorphize::apply_param_substs(self.scx,
+ self.param_substs,
+ &substs);
+ let instance = monomorphize::resolve(self.scx, def_id, substs);
+ collect_neighbours(self.scx, instance, self.output);
}
- self.super_operand(operand, location);
+ self.super_constant(constant, location);
}
- // This takes care of the "drop_in_place" intrinsic for which we otherwise
- // we would not register drop-glues.
fn visit_terminator_kind(&mut self,
block: mir::BasicBlock,
kind: &mir::TerminatorKind<'tcx>,
location: Location) {
let tcx = self.scx.tcx();
match *kind {
- mir::TerminatorKind::Call {
- func: mir::Operand::Constant(ref constant),
- ref args,
- ..
- } => {
- match constant.ty.sty {
- ty::TyFnDef(def_id, _, bare_fn_ty)
- if is_drop_in_place_intrinsic(tcx, def_id, bare_fn_ty) => {
- let operand_ty = args[0].ty(self.mir, tcx);
- if let ty::TyRawPtr(mt) = operand_ty.sty {
- let operand_ty = monomorphize::apply_param_substs(self.scx,
- self.param_substs,
- &mt.ty);
- let ty = glue::get_drop_glue_type(self.scx, operand_ty);
- self.output.push(TransItem::DropGlue(DropGlueKind::Ty(ty)));
- } else {
- bug!("Has the drop_in_place() intrinsic's signature changed?")
- }
- }
- _ => { /* Nothing to do. */ }
- }
+ mir::TerminatorKind::Call { ref func, .. } => {
+ let callee_ty = func.ty(self.mir, tcx);
+ let callee_ty = monomorphize::apply_param_substs(
+ self.scx, self.param_substs, &callee_ty);
+ visit_fn_use(self.scx, callee_ty, true, &mut self.output);
}
- _ => { /* Nothing to do. */ }
+ mir::TerminatorKind::Drop { ref location, .. } |
+ mir::TerminatorKind::DropAndReplace { ref location, .. } => {
+ let ty = location.ty(self.mir, self.scx.tcx())
+ .to_ty(self.scx.tcx());
+ let ty = monomorphize::apply_param_substs(self.scx,
+ self.param_substs,
+ &ty);
+ visit_drop_use(self.scx, ty, true, self.output);
+ }
+ mir::TerminatorKind::Goto { .. } |
+ mir::TerminatorKind::SwitchInt { .. } |
+ mir::TerminatorKind::Resume |
+ mir::TerminatorKind::Return |
+ mir::TerminatorKind::Unreachable |
+ mir::TerminatorKind::Assert { .. } => {}
}
self.super_terminator_kind(block, kind, location);
+ }
+}
+
+fn visit_drop_use<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
+ ty: ty::Ty<'tcx>,
+ is_direct_call: bool,
+ output: &mut Vec<TransItem<'tcx>>)
+{
+ let instance = monomorphize::resolve_drop_in_place(scx, ty);
+ visit_instance_use(scx, instance, is_direct_call, output);
+}
+
+fn visit_fn_use<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
+ ty: ty::Ty<'tcx>,
+ is_direct_call: bool,
+ output: &mut Vec<TransItem<'tcx>>)
+{
+ if let ty::TyFnDef(def_id, substs, _) = ty.sty {
+ let instance = monomorphize::resolve(scx, def_id, substs);
+ visit_instance_use(scx, instance, is_direct_call, output);
+ }
+}
- fn is_drop_in_place_intrinsic<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
- def_id: DefId,
- bare_fn_ty: ty::PolyFnSig<'tcx>)
- -> bool {
- (bare_fn_ty.abi() == Abi::RustIntrinsic ||
- bare_fn_ty.abi() == Abi::PlatformIntrinsic) &&
- tcx.item_name(def_id) == "drop_in_place"
+fn visit_instance_use<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
+ instance: ty::Instance<'tcx>,
+ is_direct_call: bool,
+ output: &mut Vec<TransItem<'tcx>>)
+{
+ debug!("visit_item_use({:?}, is_direct_call={:?})", instance, is_direct_call);
+ if !should_trans_locally(scx.tcx(), &instance) {
+ return
+ }
+
+ match instance.def {
+ ty::InstanceDef::Intrinsic(def_id) => {
+ if !is_direct_call {
+ bug!("intrinsic {:?} being reified", def_id);
+ }
+ }
+ ty::InstanceDef::Virtual(..) |
+ ty::InstanceDef::DropGlue(_, None) => {
+ // don't need to emit shim if we are calling directly.
+ if !is_direct_call {
+ output.push(create_fn_trans_item(instance));
+ }
+ }
+ ty::InstanceDef::DropGlue(_, Some(ty)) => {
+ match ty.sty {
+ ty::TyArray(ety, _) |
+ ty::TySlice(ety)
+ if is_direct_call =>
+ {
+ // drop of arrays/slices is translated in-line.
+ visit_drop_use(scx, ety, false, output);
+ }
+ _ => {}
+ };
+ output.push(create_fn_trans_item(instance));
+ }
+ ty::InstanceDef::ClosureOnceShim { .. } |
+ ty::InstanceDef::Item(..) |
+ ty::InstanceDef::FnPtrShim(..) => {
+ output.push(create_fn_trans_item(instance));
}
}
}
-> bool {
let def_id = match instance.def {
ty::InstanceDef::Item(def_id) => def_id,
- ty::InstanceDef::FnPtrShim(..) => return true
+ ty::InstanceDef::ClosureOnceShim { .. } |
+ ty::InstanceDef::Virtual(..) |
+ ty::InstanceDef::FnPtrShim(..) |
+ ty::InstanceDef::DropGlue(..) |
+ ty::InstanceDef::Intrinsic(_) => return true
};
match tcx.hir.get_if_local(def_id) {
Some(hir_map::NodeForeignItem(..)) => {
}
}
-fn find_drop_glue_neighbors<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
- dg: DropGlueKind<'tcx>,
- output: &mut Vec<TransItem<'tcx>>) {
- let ty = match dg {
- DropGlueKind::Ty(ty) => ty,
- DropGlueKind::TyContents(_) => {
- // We already collected the neighbors of this item via the
- // DropGlueKind::Ty variant.
- return
- }
- };
-
- debug!("find_drop_glue_neighbors: {}", type_to_string(scx.tcx(), ty));
-
- // Make sure the BoxFreeFn lang-item gets translated if there is a boxed value.
- if ty.is_box() {
- let tcx = scx.tcx();
- let def_id = tcx.require_lang_item(BoxFreeFnLangItem);
- let box_free_instance = Instance::new(
- def_id,
- tcx.mk_substs(iter::once(Kind::from(ty.boxed_ty())))
- );
- if should_trans_locally(tcx, &box_free_instance) {
- output.push(create_fn_trans_item(box_free_instance));
- }
- }
-
- // If the type implements Drop, also add a translation item for the
- // monomorphized Drop::drop() implementation.
- let destructor = match ty.sty {
- ty::TyAdt(def, _) => def.destructor(scx.tcx()),
- _ => None
- };
-
- if let (Some(destructor), false) = (destructor, ty.is_box()) {
- use rustc::ty::ToPolyTraitRef;
-
- let drop_trait_def_id = scx.tcx()
- .lang_items
- .drop_trait()
- .unwrap();
-
- let self_type_substs = scx.tcx().mk_substs_trait(ty, &[]);
-
- let trait_ref = ty::TraitRef {
- def_id: drop_trait_def_id,
- substs: self_type_substs,
- }.to_poly_trait_ref();
-
- let substs = match fulfill_obligation(scx, DUMMY_SP, trait_ref) {
- traits::VtableImpl(data) => data.substs,
- _ => bug!()
- };
- let instance = Instance::new(destructor.did, substs);
- if should_trans_locally(scx.tcx(), &instance) {
- output.push(create_fn_trans_item(instance));
- }
-
- // This type has a Drop implementation, we'll need the contents-only
- // version of the glue too.
- output.push(TransItem::DropGlue(DropGlueKind::TyContents(ty)));
- }
-
- // Finally add the types of nested values
- match ty.sty {
- ty::TyBool |
- ty::TyChar |
- ty::TyInt(_) |
- ty::TyUint(_) |
- ty::TyStr |
- ty::TyFloat(_) |
- ty::TyRawPtr(_) |
- ty::TyRef(..) |
- ty::TyFnDef(..) |
- ty::TyFnPtr(_) |
- ty::TyNever |
- ty::TyDynamic(..) => {
- /* nothing to do */
- }
- ty::TyAdt(def, _) if def.is_box() => {
- let inner_type = glue::get_drop_glue_type(scx, ty.boxed_ty());
- if scx.type_needs_drop(inner_type) {
- output.push(TransItem::DropGlue(DropGlueKind::Ty(inner_type)));
- }
- }
- ty::TyAdt(def, substs) => {
- for field in def.all_fields() {
- let field_type = def_ty(scx, field.did, substs);
- let field_type = glue::get_drop_glue_type(scx, field_type);
-
- if scx.type_needs_drop(field_type) {
- output.push(TransItem::DropGlue(DropGlueKind::Ty(field_type)));
- }
- }
- }
- ty::TyClosure(def_id, substs) => {
- for upvar_ty in substs.upvar_tys(def_id, scx.tcx()) {
- let upvar_ty = glue::get_drop_glue_type(scx, upvar_ty);
- if scx.type_needs_drop(upvar_ty) {
- output.push(TransItem::DropGlue(DropGlueKind::Ty(upvar_ty)));
- }
- }
- }
- ty::TySlice(inner_type) |
- ty::TyArray(inner_type, _) => {
- let inner_type = glue::get_drop_glue_type(scx, inner_type);
- if scx.type_needs_drop(inner_type) {
- output.push(TransItem::DropGlue(DropGlueKind::Ty(inner_type)));
- }
- }
- ty::TyTuple(args, _) => {
- for arg in args {
- let arg = glue::get_drop_glue_type(scx, arg);
- if scx.type_needs_drop(arg) {
- output.push(TransItem::DropGlue(DropGlueKind::Ty(arg)));
- }
- }
- }
- ty::TyProjection(_) |
- ty::TyParam(_) |
- ty::TyInfer(_) |
- ty::TyAnon(..) |
- ty::TyError => {
- bug!("encountered unexpected type");
- }
- }
-}
-
-enum StaticDispatchResult<'tcx> {
- // The call could be resolved statically as going to the method with
- // `instance`.
- Dispatched {
- instance: Instance<'tcx>,
- // If this is a call to a closure that needs an FnOnce adjustment,
- // this contains the new self type of the call (= type of the closure
- // environment)
- fn_once_adjustment: Option<ty::Ty<'tcx>>,
- },
- // This goes to somewhere that we don't know at compile-time
- Unknown
-}
-
-fn do_static_dispatch<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
- fn_def_id: DefId,
- fn_substs: &'tcx Substs<'tcx>)
- -> StaticDispatchResult<'tcx> {
- debug!("do_static_dispatch(fn_def_id={}, fn_substs={:?})",
- def_id_to_string(scx.tcx(), fn_def_id),
- fn_substs);
- if let Some(trait_def_id) = scx.tcx().trait_of_item(fn_def_id) {
- debug!(" => trait method, attempting to find impl");
- do_static_trait_method_dispatch(scx,
- &scx.tcx().associated_item(fn_def_id),
- trait_def_id,
- fn_substs)
- } else {
- debug!(" => regular function");
- // The function is not part of an impl or trait, no dispatching
- // to be done
- StaticDispatchResult::Dispatched {
- instance: Instance::new(fn_def_id, fn_substs),
- fn_once_adjustment: None,
- }
- }
-}
-
-// Given a trait-method and substitution information, find out the actual
-// implementation of the trait method.
-fn do_static_trait_method_dispatch<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>,
- trait_method: &ty::AssociatedItem,
- trait_id: DefId,
- rcvr_substs: &'tcx Substs<'tcx>)
- -> StaticDispatchResult<'tcx> {
- let tcx = scx.tcx();
- debug!("do_static_trait_method_dispatch(trait_method={}, \
- trait_id={}, \
- rcvr_substs={:?})",
- def_id_to_string(scx.tcx(), trait_method.def_id),
- def_id_to_string(scx.tcx(), trait_id),
- rcvr_substs);
-
- let trait_ref = ty::TraitRef::from_method(tcx, trait_id, rcvr_substs);
- let vtbl = fulfill_obligation(scx, DUMMY_SP, ty::Binder(trait_ref));
-
- // Now that we know which impl is being used, we can dispatch to
- // the actual function:
- match vtbl {
- traits::VtableImpl(impl_data) => {
- StaticDispatchResult::Dispatched {
- instance: find_method(tcx, trait_method.name, rcvr_substs, &impl_data),
- fn_once_adjustment: None,
- }
- }
- traits::VtableClosure(closure_data) => {
- let closure_def_id = closure_data.closure_def_id;
- let trait_closure_kind = tcx.lang_items.fn_trait_kind(trait_id).unwrap();
- let actual_closure_kind = tcx.closure_kind(closure_def_id);
-
- let needs_fn_once_adapter_shim =
- match needs_fn_once_adapter_shim(actual_closure_kind,
- trait_closure_kind) {
- Ok(true) => true,
- _ => false,
- };
-
- let fn_once_adjustment = if needs_fn_once_adapter_shim {
- Some(tcx.mk_closure_from_closure_substs(closure_def_id,
- closure_data.substs))
- } else {
- None
- };
-
- StaticDispatchResult::Dispatched {
- instance: Instance::new(closure_def_id, closure_data.substs.substs),
- fn_once_adjustment: fn_once_adjustment,
- }
- }
- traits::VtableFnPointer(ref data) => {
- // If we know the destination of this fn-pointer, we'll have to make
- // sure that this destination actually gets instantiated.
- if let ty::TyFnDef(def_id, substs, _) = data.fn_ty.sty {
- // The destination of the pointer might be something that needs
- // further dispatching, such as a trait method, so we do that.
- do_static_dispatch(scx, def_id, substs)
- } else {
- StaticDispatchResult::Unknown
- }
- }
- // Trait object shims are always instantiated in-place, and as they are
- // just an ABI-adjusting indirect call they do not have any dependencies.
- traits::VtableObject(..) => {
- StaticDispatchResult::Unknown
- }
- _ => {
- bug!("static call to invalid vtable: {:?}", vtbl)
- }
- }
-}
-
/// For given pair of source and target type that occur in an unsizing coercion,
/// this function finds the pair of types that determines the vtable linking
/// them.
&ty::TyAdt(target_adt_def, target_substs)) => {
assert_eq!(source_adt_def, target_adt_def);
- let kind = custom_coerce_unsize_info(scx, source_ty, target_ty);
+ let kind =
+ monomorphize::custom_coerce_unsize_info(scx, source_ty, target_ty);
let coerce_index = match kind {
CustomCoerceUnsized::Struct(i) => i
// Walk all methods of the trait, including those of its supertraits
let methods = traits::get_vtable_methods(scx.tcx(), poly_trait_ref);
let methods = methods.filter_map(|method| method)
- .filter_map(|(def_id, substs)| {
- if let StaticDispatchResult::Dispatched {
- instance,
- // We already add the drop-glue for the closure env
- // unconditionally below.
- fn_once_adjustment: _ ,
- } = do_static_dispatch(scx, def_id, substs) {
- Some(instance)
- } else {
- None
- }
- })
+ .map(|(def_id, substs)| monomorphize::resolve(scx, def_id, substs))
.filter(|&instance| should_trans_locally(scx.tcx(), &instance))
.map(|instance| create_fn_trans_item(instance));
output.extend(methods);
}
// Also add the destructor
- let dg_type = glue::get_drop_glue_type(scx, impl_ty);
- output.push(TransItem::DropGlue(DropGlueKind::Ty(dg_type)));
+ visit_drop_use(scx, impl_ty, false, output);
}
}
def_id_to_string(self.scx.tcx(), def_id));
let ty = def_ty(self.scx, def_id, Substs::empty());
- let ty = glue::get_drop_glue_type(self.scx, ty);
- self.output.push(TransItem::DropGlue(DropGlueKind::Ty(ty)));
+ visit_drop_use(self.scx, ty, true, self.output);
}
}
}
+ hir::ItemGlobalAsm(..) => {
+ debug!("RootCollector: ItemGlobalAsm({})",
+ def_id_to_string(self.scx.tcx(),
+ self.scx.tcx().hir.local_def_id(item.id)));
+ self.output.push(TransItem::GlobalAsm(item.id));
+ }
hir::ItemStatic(..) => {
debug!("RootCollector: ItemStatic({})",
def_id_to_string(self.scx.tcx(),
continue;
}
- // The substitutions we have are on the impl, so we grab
- // the method type from the impl to substitute into.
- let impl_substs = tcx.empty_substs_for_def_id(impl_def_id);
- let impl_data = traits::VtableImplData {
- impl_def_id: impl_def_id,
- substs: impl_substs,
- nested: vec![]
- };
- let instance = find_method(tcx, method.name, callee_substs, &impl_data);
+ let instance =
+ monomorphize::resolve(scx, method.def_id, callee_substs);
let predicates = tcx.item_predicates(instance.def_id()).predicates
- .subst(tcx, impl_substs);
+ .subst(tcx, instance.substs);
if !traits::normalize_and_test_predicates(tcx, predicates) {
continue;
}
printer.push_def_path(def_id, &mut output);
output
}
-
-fn type_to_string<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
- ty: ty::Ty<'tcx>)
- -> String {
- let mut output = String::new();
- let printer = DefPathBasedNames::new(tcx, false, false);
- printer.push_type_name(ty, &mut output);
- output
-}
projects / rust.git / blobdiff