nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #113659 - ericmarkmartin:smir-refs-and-ptrs, r=spastorino

Browse Source 
Add ty convs for smir refs and ptrs

r? `@spastorino`
This commit is contained in:
bors 2023-07-18 07:22:33 +00:00
commit 0f16bd341e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,12 @@ impl<'tcx> Tables<'tcx> {
TyKind::RigidTy(RigidTy::Array(self.intern_ty(*ty), opaque(constant)))
}
ty::Slice(ty) => TyKind::RigidTy(RigidTy::Slice(self.intern_ty(*ty))),
ty::RawPtr(_) => todo!(),
ty::Ref(_, _, _) => todo!(),
ty::RawPtr(ty::TypeAndMut { ty, mutbl }) => {
TyKind::RigidTy(RigidTy::RawPtr(self.intern_ty(*ty), mutbl.stable()))
}
ty::Ref(region, ty, mutbl) => {
TyKind::RigidTy(RigidTy::Ref(opaque(region), self.intern_ty(*ty), mutbl.stable()))
}
ty::FnDef(_, _) => todo!(),
ty::FnPtr(_) => todo!(),
ty::Dynamic(_, _, _) => todo!(),

4
compiler/rustc_smir/src/stable_mir/mir/body.rs
View File

@ -1,4 +1,4 @@
use crate::rustc_internal::Opaque;
use crate::stable_mir::ty::Region;
use crate::stable_mir::{self, ty::Ty};
#[derive(Clone, Debug)]
@ -137,8 +137,6 @@ pub enum Statement {
Nop,
}
type Region = Opaque;
// FIXME this is incomplete
#[derive(Clone, Debug)]
pub enum Rvalue {

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

@ -1,4 +1,4 @@
use super::{with, DefId};
use super::{mir::Mutability, with, DefId};
use crate::rustc_internal::Opaque;
#[derive(Copy, Clone, Debug)]
@ -11,7 +11,7 @@ impl Ty {
}
type Const = Opaque;
type Region = Opaque;
pub(crate) type Region = Opaque;
#[derive(Clone, Debug)]
pub enum TyKind {
@ -29,6 +29,8 @@ pub enum RigidTy {
Str,
Array(Ty, Const),
Slice(Ty),
RawPtr(Ty, Mutability),
Ref(Region, Ty, Mutability),
Tuple(Vec<Ty>),
}