bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clarify comment, dedupe match arms in shim.rs.

Browse source 
Also add a missing terminal newline to a test.
This commit is contained in:
Adam Perry 2019-10-09 21:02:54 -07:00
parent b8414c13ab
commit 8a097f2619
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,9 @@ pub enum InstanceDef<'tcx> {
/// `<T as Trait>::method` where `method` receives unsizeable `self: Self`.
VtableShim(DefId),
/// `fn()` pointer where the function is annotated with `#[track_caller]`.
/// `fn()` pointer where the function itself cannot be turned into a pointer.
///
/// One example in the compiler today is functions annotated with `#[track_caller]`.
ReifyShim(DefId),
/// `<fn() as FnTrait>::call_*`

17
src/librustc_mir/shim.rs
View file

@ -41,15 +41,6 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> &'tcx
None,
)
}
ty::InstanceDef::ReifyShim(def_id) => {
build_call_shim(
tcx,
def_id,
Adjustment::Identity, // TODO(anp) is this the right kind of adjustment?
CallKind::Direct(def_id),
None,
)
}
ty::InstanceDef::FnPtrShim(def_id, ty) => {
let trait_ = tcx.trait_of_item(def_id).unwrap();
let adjustment = match tcx.lang_items().fn_trait_kind(trait_) {
@ -75,9 +66,11 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> &'tcx
Some(arg_tys)
)
}
ty::InstanceDef::Virtual(def_id, _) => {
// We are generating a call back to our def-id, which the
// codegen backend knows to turn to an actual virtual call.
// We are generating a call back to our def-id, which the
// codegen backend knows to turn to an actual virtual call.
ty::InstanceDef::Virtual(def_id, _) |
// ...or we are generating a call to the inner closure defined by #[track_caller]
ty::InstanceDef::ReifyShim(def_id) => {
build_call_shim(
tcx,
def_id,

2
src/test/ui/rfc-2091-track-caller/taking-fn-pointer.rs
View file

@ -13,4 +13,4 @@ fn call_it(x: fn()) {
fn main() {
call_it(f);
}
}