OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always use resolve

Browse Source
This commit is contained in:
Douglas Campos 2017-09-19 09:14:43 -04:00
parent 3bd09dee45
commit 5eb302fba8
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc_mir/transform/inline.rs
View File

@ -87,32 +87,17 @@ impl<'a, 'tcx> Inliner<'a, 'tcx> {
let terminator = bb_data.terminator();
if let TerminatorKind::Call {
func: Operand::Constant(ref f), .. } = terminator.kind {
if let ty::TyFnDef(callee_def_id, substs) = f.ty.sty {
match self.tcx.trait_of_item(callee_def_id) {
Some(_) => {
match Instance::new(callee_def_id, substs).resolve(self.tcx) {
Some(instance) => {
callsites.push_back(CallSite {
callee: instance.def_id(),
substs: instance.substs,
bb,
location: terminator.source_info
});
},
None => {}
}
}
None => {
if let ty::TyFnDef(callee_def_id, substs) = f.ty.sty {
if let Some(instance) = Instance::new(callee_def_id, substs).resolve(self.tcx) {
callsites.push_back(CallSite {
callee: callee_def_id,
substs,
callee: instance.def_id(),
substs: instance.substs,
bb,
location: terminator.source_info
});
}
}
}
}
}
}