Fix CrateItem::kind() to include constructors

celinval · celinval · commit b9db38ff2156 · 2023-12-19T12:11:10.000-08:00
- Also add a method to get the instance instantiation arguments, and
  include that information in the instance debug.
diff --git a/compiler/rustc_smir/src/rustc_smir/context.rs b/compiler/rustc_smir/src/rustc_smir/context.rs
@@ -335,6 +335,12 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
         instance.ty(tables.tcx, ParamEnv::reveal_all()).stable(&mut *tables)
     }
 
+    fn instance_args(&self, def: InstanceDef) -> GenericArgs {
+        let mut tables = self.0.borrow_mut();
+        let instance = tables.instances[def];
+        instance.args.stable(&mut *tables)
+    }
+
     fn instance_def_id(&self, def: InstanceDef) -> stable_mir::DefId {
         let mut tables = self.0.borrow_mut();
         let def_id = tables.instances[def].def_id();
diff --git a/compiler/rustc_smir/src/rustc_smir/mod.rs b/compiler/rustc_smir/src/rustc_smir/mod.rs
@@ -85,11 +85,10 @@ pub(crate) fn new_item_kind(kind: DefKind) -> ItemKind {
         | DefKind::Field
         | DefKind::LifetimeParam
         | DefKind::Impl { .. }
-        | DefKind::Ctor(_, _)
         | DefKind::GlobalAsm => {
             unreachable!("Not a valid item kind: {kind:?}");
         }
-        DefKind::Closure | DefKind::AssocFn | DefKind::Fn => ItemKind::Fn,
+        DefKind::Ctor(_, _) | DefKind::Closure | DefKind::AssocFn | DefKind::Fn => ItemKind::Fn,
         DefKind::Const | DefKind::InlineConst | DefKind::AssocConst | DefKind::AnonConst => {
             ItemKind::Const
         }
diff --git a/compiler/stable_mir/src/compiler_interface.rs b/compiler/stable_mir/src/compiler_interface.rs
@@ -124,6 +124,9 @@ pub trait Context {
     /// Get the instance type with generic substitutions applied and lifetimes erased.
     fn instance_ty(&self, instance: InstanceDef) -> Ty;
 
+    /// Get the instantiation types.
+    fn instance_args(&self, def: InstanceDef) -> GenericArgs;
+
     /// Get the instance.
     fn instance_def_id(&self, instance: InstanceDef) -> DefId;
 
diff --git a/compiler/stable_mir/src/mir/mono.rs b/compiler/stable_mir/src/mir/mono.rs
@@ -34,6 +34,11 @@ pub enum InstanceKind {
 }
 
 impl Instance {
+    /// Get the arguments this instance was instantiated with.
+    pub fn args(&self) -> GenericArgs {
+        with(|cx| cx.instance_args(self.def))
+    }
+
     /// Get the body of an Instance. The body will be eagerly monomorphized.
     pub fn body(&self) -> Option<Body> {
         with(|context| context.instance_body(self.def))
@@ -142,6 +147,7 @@ impl Debug for Instance {
         f.debug_struct("Instance")
             .field("kind", &self.kind)
             .field("def", &self.mangled_name())
+            .field("args", &self.args())
             .finish()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,10 @@ pub(crate) fn new_item_kind(kind: DefKind) -> ItemKind {`
`85`	`85`	`\| DefKind::Field`
`86`	`86`	`\| DefKind::LifetimeParam`
`87`	`87`	`\| DefKind::Impl { .. }`
`88`		`- \| DefKind::Ctor(_, _)`
`89`	`88`	`\| DefKind::GlobalAsm => {`
`90`	`89`	`unreachable!("Not a valid item kind: {kind:?}");`
`91`	`90`	`}`
`92`		`- DefKind::Closure \| DefKind::AssocFn \| DefKind::Fn => ItemKind::Fn,`
	`91`	`+ DefKind::Ctor(_, _) \| DefKind::Closure \| DefKind::AssocFn \| DefKind::Fn => ItemKind::Fn,`
`93`	`92`	`DefKind::Const \| DefKind::InlineConst \| DefKind::AssocConst \| DefKind::AnonConst => {`
`94`	`93`	`ItemKind::Const`
`95`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ pub enum InstanceKind {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`impl Instance {`
	`37`	`+ /// Get the arguments this instance was instantiated with.`
	`38`	`+ pub fn args(&self) -> GenericArgs {`
	`39`	`+ with(\|cx\| cx.instance_args(self.def))`
	`40`	`+ }`
	`41`	`+`
`37`	`42`	`/// Get the body of an Instance. The body will be eagerly monomorphized.`
`38`	`43`	`pub fn body(&self) -> Option<Body> {`
`39`	`44`	`with(\|context\| context.instance_body(self.def))`
`@@ -142,6 +147,7 @@ impl Debug for Instance {`
`142`	`147`	`f.debug_struct("Instance")`
`143`	`148`	`.field("kind", &self.kind)`
`144`	`149`	`.field("def", &self.mangled_name())`
	`150`	`+ .field("args", &self.args())`
`145`	`151`	`.finish()`
`146`	`152`	`}`
`147`	`153`	`}`