bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix crash for CrateItem::kind() with constructors

Browse source 
Change how we classify item kind for DefKind::Ctor
This commit is contained in:
Celina G. Val 2023-12-19 14:14:17 -08:00
parent 92ad4b433a
commit a8556da672
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_smir/src/rustc_smir/mod.rs
View file

@ -7,7 +7,7 @@
//! //!
//! For now, we are developing everything inside `rustc`, thus, we keep this module private. //! For now, we are developing everything inside `rustc`, thus, we keep this module private.
use rustc_hir::def::DefKind; use rustc_hir::def::{CtorKind, DefKind};
use rustc_middle::mir; use rustc_middle::mir;
use rustc_middle::mir::interpret::AllocId; use rustc_middle::mir::interpret::AllocId;
use rustc_middle::ty::{self, Instance, Ty, TyCtxt}; use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
@ -88,14 +88,17 @@ pub(crate) fn new_item_kind(kind: DefKind) -> ItemKind {
| DefKind::Field | DefKind::Field
| DefKind::LifetimeParam | DefKind::LifetimeParam
| DefKind::Impl { .. } | DefKind::Impl { .. }
| DefKind::Ctor(_, _)
| DefKind::GlobalAsm => { | DefKind::GlobalAsm => {
unreachable!("Not a valid item kind: {kind:?}"); unreachable!("Not a valid item kind: {kind:?}");
} }
DefKind::Closure | DefKind::AssocFn | DefKind::Fn => ItemKind::Fn, DefKind::Ctor(_, CtorKind::Fn) | DefKind::Closure | DefKind::AssocFn | DefKind::Fn => {
DefKind::Const | DefKind::InlineConst | DefKind::AssocConst | DefKind::AnonConst => { ItemKind::Fn
ItemKind::Const
} }
DefKind::Ctor(_, CtorKind::Const)
| DefKind::Const
| DefKind::InlineConst
| DefKind::AssocConst
| DefKind::AnonConst => ItemKind::Const,
DefKind::Static(_) => ItemKind::Static, DefKind::Static(_) => ItemKind::Static,
} }
} }