nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Foreign to SMIR

Browse Source
This commit is contained in:
Santiago Pastorino 2023-07-18 11:18:40 -03:00
parent 8d361cbd91
commit 9b32319205
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_smir/src/rustc_internal/mod.rs
View File

@ -31,6 +31,10 @@ pub fn adt_def(did: DefId) -> stable_mir::ty::AdtDef {
with_tables(|t| t.adt_def(did)) with_tables(|t| t.adt_def(did))
} }
pub fn foreign_def(did: DefId) -> stable_mir::ty::ForeignDef {
with_tables(|t| t.foreign_def(did))
}
impl<'tcx> Tables<'tcx> { impl<'tcx> Tables<'tcx> {
pub fn item_def_id(&self, item: &stable_mir::CrateItem) -> DefId { pub fn item_def_id(&self, item: &stable_mir::CrateItem) -> DefId {
self.def_ids[item.0] self.def_ids[item.0]
@ -44,6 +48,10 @@ impl<'tcx> Tables<'tcx> {
stable_mir::ty::AdtDef(self.create_def_id(did)) stable_mir::ty::AdtDef(self.create_def_id(did))
} }
pub fn foreign_def(&mut self, did: DefId) -> stable_mir::ty::ForeignDef {
stable_mir::ty::ForeignDef(self.create_def_id(did))
}
fn create_def_id(&mut self, did: DefId) -> stable_mir::DefId { fn create_def_id(&mut self, did: DefId) -> stable_mir::DefId {
// FIXME: this becomes inefficient when we have too many ids // FIXME: this becomes inefficient when we have too many ids
for (i, &d) in self.def_ids.iter().enumerate() { for (i, &d) in self.def_ids.iter().enumerate() {

4
compiler/rustc_smir/src/rustc_smir/mod.rs
View File

@ -113,7 +113,9 @@ impl<'tcx> Tables<'tcx> {
.collect(), .collect(),
), ),
)), )),
ty::Foreign(_) => todo!(), ty::Foreign(def_id) => {
TyKind::RigidTy(RigidTy::Foreign(rustc_internal::foreign_def(*def_id)))
}
ty::Str => TyKind::RigidTy(RigidTy::Str), ty::Str => TyKind::RigidTy(RigidTy::Str),
ty::Array(ty, constant) => { ty::Array(ty, constant) => {
TyKind::RigidTy(RigidTy::Array(self.intern_ty(*ty), opaque(constant))) TyKind::RigidTy(RigidTy::Array(self.intern_ty(*ty), opaque(constant)))

4
compiler/rustc_smir/src/stable_mir/ty.rs
View File

@ -26,6 +26,7 @@ pub enum RigidTy {
Uint(UintTy), Uint(UintTy),
Float(FloatTy), Float(FloatTy),
Adt(AdtDef, AdtSubsts), Adt(AdtDef, AdtSubsts),
Foreign(ForeignDef),
Str, Str,
Array(Ty, Const), Array(Ty, Const),
Slice(Ty), Slice(Ty),
@ -60,6 +61,9 @@ pub enum FloatTy {
F64, F64,
} }
#[derive(Clone, PartialEq, Eq, Debug)]
pub struct ForeignDef(pub(crate) DefId);
#[derive(Clone, PartialEq, Eq, Debug)] #[derive(Clone, PartialEq, Eq, Debug)]
pub struct AdtDef(pub(crate) DefId); pub struct AdtDef(pub(crate) DefId);