bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Instance::resolve_for_fn_ptr unconditionally resolves first.

Browse source 
Per review feedback.
This commit is contained in:
Adam Perry 2019-10-10 07:31:22 -07:00
parent 1cdd5d099d
commit 407d1d5fd4
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/librustc/ty/instance.rs
View file

@ -310,15 +310,19 @@ impl<'tcx> Instance<'tcx> {
substs: SubstsRef<'tcx>, substs: SubstsRef<'tcx>,
) -> Option<Instance<'tcx>> { ) -> Option<Instance<'tcx>> {
debug!("resolve(def_id={:?}, substs={:?})", def_id, substs); debug!("resolve(def_id={:?}, substs={:?})", def_id, substs);
if tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::TRACK_CALLER) { Instance::resolve(tcx, param_env, def_id, substs).map(|resolved| {
debug!(" => fn pointer created for function with #[track_caller]"); let resolved_def = resolved.def_id();
Some(Instance { let codegen_attrs = tcx.codegen_fn_attrs(resolved_def);
def: InstanceDef::ReifyShim(def_id), if codegen_attrs.flags.contains(CodegenFnAttrFlags::TRACK_CALLER) {
substs, debug!(" => fn pointer created for function with #[track_caller]");
}) Instance {
} else { def: InstanceDef::ReifyShim(resolved_def),
Instance::resolve(tcx, param_env, def_id, substs) substs,
} }
} else {
resolved
}
})
} }
pub fn resolve_for_vtable( pub fn resolve_for_vtable(