From 08036a8005d1eb9f2b6bbb61d0a380c2a725f179 Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Fri, 10 Nov 2023 13:32:37 -0800 Subject: [PATCH] Address PR comments --- compiler/rustc_smir/src/rustc_smir/mod.rs | 3 +-- compiler/stable_mir/src/mir/mono.rs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_smir/src/rustc_smir/mod.rs b/compiler/rustc_smir/src/rustc_smir/mod.rs index 059d39fee4f..8662a9c7ec1 100644 --- a/compiler/rustc_smir/src/rustc_smir/mod.rs +++ b/compiler/rustc_smir/src/rustc_smir/mod.rs @@ -327,8 +327,7 @@ impl<'tcx> Tables<'tcx> { fn has_body(&self, instance: Instance<'tcx>) -> bool { let def_id = instance.def_id(); - !self.tcx.is_foreign_item(def_id) - && self.tcx.is_mir_available(def_id) + self.tcx.is_mir_available(def_id) && !matches!( instance.def, ty::InstanceDef::Virtual(..) | ty::InstanceDef::Intrinsic(..) diff --git a/compiler/stable_mir/src/mir/mono.rs b/compiler/stable_mir/src/mir/mono.rs index 5d197a32dbd..3524295f597 100644 --- a/compiler/stable_mir/src/mir/mono.rs +++ b/compiler/stable_mir/src/mir/mono.rs @@ -61,7 +61,7 @@ impl Instance { with(|cx| cx.resolve_drop_in_place(ty)) } - /// Resolve the drop in place for a given type. + /// Resolve an instance for a given function pointer. pub fn resolve_for_fn_ptr(def: FnDef, args: &GenericArgs) -> Result { with(|context| { context.resolve_for_fn_ptr(def, args).ok_or_else(|| { @@ -70,7 +70,7 @@ impl Instance { }) } - /// Resolve a closure (do we need kind? -- most cases use FnOnce) + /// Resolve a closure with the expected kind. pub fn resolve_closure( def: ClosureDef, args: &GenericArgs,