Skip to content

Commit

Permalink
Merge pull request #1319 from Nadrieril/less-mir
Browse files Browse the repository at this point in the history 
Translate less data in MIR
  • Loading branch information
@Nadrieril
Nadrieril authored Feb 20, 2025
2 parents 202a6aa + 02d1f4b commit 54dc196
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 162 deletions.
3 changes: 1 addition & 2 deletions engine/lib/import_thir.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -847,8 +847,7 @@ end) : EXPR = struct
Array { fields = List.map ~f:constant_expr_to_expr fields }
| Tuple { fields } ->
Tuple { fields = List.map ~f:constant_expr_to_expr fields }
| GlobalName { id; variant_information; _ } ->
GlobalName { id; constructor = variant_information }
| GlobalName { id; _ } -> GlobalName { id; constructor = None }
| Borrow arg ->
Borrow { arg = constant_expr_to_expr arg; borrow_kind = Thir.Shared }
| ConstRef { id } -> ConstRef { id }
Expand Down
7 changes: 1 addition & 6 deletions frontend/exporter/src/constant_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ pub enum ConstantExprKind {
id: GlobalIdent,
generics: Vec<GenericArg>,
trait_refs: Vec<ImplExpr>,
variant_information: Option<VariantInformations>,
},
/// A trait constant
///
Expand Down Expand Up @@ -194,10 +193,9 @@ mod rustc {
id,
generics: _,
trait_refs: _,
variant_information,
} => ExprKind::GlobalName {
id,
constructor: variant_information,
constructor: None,
},
Borrow(e) => ExprKind::Borrow {
borrow_kind: BorrowKind::Shared,
Expand Down Expand Up @@ -328,7 +326,6 @@ mod rustc {
id: did.sinto(s),
generics: Vec::new(),
trait_refs: Vec::new(),
variant_information: None,
},
GlobalAlloc::Memory(alloc) => {
let bytes = alloc
Expand Down Expand Up @@ -492,7 +489,6 @@ mod rustc {
id,
generics,
trait_refs,
variant_information: None,
}
}
} else {
Expand All @@ -503,7 +499,6 @@ mod rustc {
id,
generics: vec![],
trait_refs: vec![],
variant_information: None,
}
};
let cv = kind.decorate(ty.sinto(s), span.sinto(s));
Expand Down
157 changes: 25 additions & 132 deletions frontend/exporter/src/types/mir.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,11 @@
//! or patterns; instead the control flow is entirely described by gotos and switches on integer
//! values.
use crate::prelude::*;
use crate::sinto_as_usize;
#[cfg(feature = "rustc")]
use rustc_middle::{mir, ty};
#[cfg(feature = "rustc")]
use tracing::trace;

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<S>, from: rustc_middle::mir::MirPhase, state: S as s)]
pub enum MirPhase {
Built,
Analysis(AnalysisPhase),
Runtime(RuntimePhase),
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: rustc_middle::mir::SourceInfo, state: S as s)]
Expand All @@ -31,61 +21,23 @@ pub struct SourceInfo {
#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: rustc_middle::mir::LocalDecl<'tcx>, state: S as s)]
pub struct LocalDecl {
pub mutability: Mutability,
pub local_info: ClearCrossCrate<LocalInfo>,
pub ty: Ty,
pub user_ty: Option<UserTypeProjections>,
pub source_info: SourceInfo,
#[value(None)]
pub name: Option<String>, // This information is contextual, thus the SInto instance initializes it to None, and then we fill it while `SInto`ing MirBody
}

#[derive_group(Serializers)]
#[derive(Clone, Debug, JsonSchema)]
pub enum ClearCrossCrate<T> {
Clear,
Set(T),
}

#[cfg(feature = "rustc")]
impl<S, TT, T: SInto<S, TT>> SInto<S, ClearCrossCrate<TT>>
for rustc_middle::mir::ClearCrossCrate<T>
{
fn sinto(&self, s: &S) -> ClearCrossCrate<TT> {
match self {
rustc_middle::mir::ClearCrossCrate::Clear => ClearCrossCrate::Clear,
rustc_middle::mir::ClearCrossCrate::Set(x) => ClearCrossCrate::Set(x.sinto(s)),
}
}
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<S>, from: rustc_middle::mir::RuntimePhase, state: S as _s)]
pub enum RuntimePhase {
Initial,
PostCleanup,
Optimized,
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<S>, from: rustc_middle::mir::AnalysisPhase, state: S as _s)]
pub enum AnalysisPhase {
Initial,
PostCleanup,
}

pub type BasicBlocks = IndexVec<BasicBlock, BasicBlockData>;

#[cfg(feature = "rustc")]
fn name_of_local(
local: rustc_middle::mir::Local,
var_debug_info: &Vec<rustc_middle::mir::VarDebugInfo>,
var_debug_info: &Vec<mir::VarDebugInfo>,
) -> Option<String> {
var_debug_info
.iter()
.find(|info| {
if let rustc_middle::mir::VarDebugInfoContents::Place(place) = info.value {
if let mir::VarDebugInfoContents::Place(place) = info.value {
place.projection.is_empty() && place.local == local
} else {
false
Expand Down Expand Up @@ -208,25 +160,31 @@ pub mod mir_kinds {
pub use mir_kinds::IsMirKind;

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: rustc_middle::mir::ConstOperand<'tcx>, state: S as s)]
pub struct Constant {
#[derive(Clone, Debug, JsonSchema)]
pub struct ConstOperand {
pub span: Span,
pub user_ty: Option<UserTypeAnnotationIndex>,
pub const_: TypedConstantKind,
pub ty: Ty,
pub const_: ConstantExpr,
}

#[cfg(feature = "rustc")]
impl<'tcx, S: UnderOwnerState<'tcx>> SInto<S, ConstOperand>
for rustc_middle::mir::ConstOperand<'tcx>
{
fn sinto(&self, s: &S) -> ConstOperand {
ConstOperand {
span: self.span.sinto(s),
ty: self.const_.ty().sinto(s),
const_: self.const_.sinto(s),
}
}
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx> + HasMir<'tcx>>, from: rustc_middle::mir::Body<'tcx>, state: S as s)]
pub struct MirBody<KIND> {
#[map(x.clone().as_mut().sinto(s))]
pub basic_blocks: BasicBlocks,
pub phase: MirPhase,
pub pass_count: usize,
pub source: MirSource,
pub source_scopes: IndexVec<SourceScope, SourceScopeData>,
pub coroutine: Option<CoroutineInfo>,
pub span: Span,
#[map({
let mut local_decls: rustc_index::IndexVec<rustc_middle::mir::Local, LocalDecl> = x.iter().map(|local_decl| {
local_decl.sinto(s)
Expand All @@ -238,13 +196,9 @@ pub struct MirBody<KIND> {
local_decls.into()
})]
pub local_decls: IndexVec<Local, LocalDecl>,
pub user_type_annotations: CanonicalUserTypeAnnotations,
pub arg_count: usize,
pub spread_arg: Option<Local>,
pub var_debug_info: Vec<VarDebugInfo>,
pub span: Span,
pub is_polymorphic: bool,
pub injection_phase: Option<MirPhase>,
#[map(x.clone().as_mut().sinto(s))]
pub basic_blocks: BasicBlocks,
pub source_scopes: IndexVec<SourceScope, SourceScopeData>,
pub tainted_by_errors: Option<ErrorGuaranteed>,
#[value(std::marker::PhantomData)]
pub _kind: std::marker::PhantomData<KIND>,
Expand All @@ -256,24 +210,7 @@ pub struct MirBody<KIND> {
pub struct SourceScopeData {
pub span: Span,
pub parent_scope: Option<SourceScope>,
pub inlined: Option<(Instance, Span)>,
pub inlined_parent_scope: Option<SourceScope>,
pub local_data: ClearCrossCrate<SourceScopeLocalData>,
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: rustc_middle::ty::Instance<'tcx>, state: S as s)]
pub struct Instance {
pub def: InstanceKind,
pub args: Vec<GenericArg>,
}

#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx>>, from: rustc_middle::mir::SourceScopeLocalData, state: S as s)]
pub struct SourceScopeLocalData {
pub lint_root: HirId,
}

#[derive_group(Serializers)]
Expand All @@ -282,15 +219,15 @@ pub struct SourceScopeLocalData {
pub enum Operand {
Copy(Place),
Move(Place),
Constant(Constant),
Constant(ConstOperand),
}

#[cfg(feature = "rustc")]
impl Operand {
pub(crate) fn ty(&self) -> &Ty {
match self {
Operand::Copy(p) | Operand::Move(p) => &p.ty,
Operand::Constant(c) => &c.const_.typ,
Operand::Constant(c) => &c.ty,
}
}
}
Expand Down Expand Up @@ -1044,9 +981,6 @@ pub struct BasicBlockData {
pub is_cleanup: bool,
}

pub type CanonicalUserTypeAnnotations =
IndexVec<UserTypeAnnotationIndex, CanonicalUserTypeAnnotation>;

make_idx_wrapper!(rustc_middle::mir, BasicBlock);
make_idx_wrapper!(rustc_middle::mir, SourceScope);
make_idx_wrapper!(rustc_middle::mir, Local);
Expand Down Expand Up @@ -1107,33 +1041,6 @@ pub enum BinOp {
Offset,
}

/// Reflects [`rustc_middle::mir::ScopeData`]
#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx> + HasThir<'tcx>>, from: rustc_middle::middle::region::ScopeData, state: S as gstate)]
pub enum ScopeData {
Node,
CallSite,
Arguments,
Destruction,
IfThen,
IfThenRescope,
Remainder(FirstStatementIndex),
}

sinto_as_usize!(rustc_middle::middle::region, FirstStatementIndex);

/// Reflects [`rustc_middle::mir::BinOp`]
#[derive_group(Serializers)]
#[derive(AdtInto, Clone, Debug, JsonSchema)]
#[args(<'tcx, S: UnderOwnerState<'tcx> + HasThir<'tcx>>, from: rustc_middle::middle::region::Scope, state: S as gstate)]
pub struct Scope {
pub id: ItemLocalId,
pub data: ScopeData,
}

sinto_as_usize!(rustc_hir::hir_id, ItemLocalId);

#[cfg(feature = "rustc")]
impl<'tcx, S: UnderOwnerState<'tcx>> SInto<S, ConstantExpr> for rustc_middle::mir::Const<'tcx> {
fn sinto(&self, s: &S) -> ConstantExpr {
Expand Down Expand Up @@ -1166,13 +1073,6 @@ impl<'tcx, S: UnderOwnerState<'tcx>> SInto<S, ConstantExpr> for rustc_middle::mi
}
}

#[cfg(feature = "rustc")]
impl<S> SInto<S, u64> for rustc_middle::mir::interpret::AllocId {
fn sinto(&self, _: &S) -> u64 {
self.0.get()
}
}

/// Reflects [`rustc_middle::mir::BorrowKind`]
#[derive(AdtInto)]
#[args(<S>, from: rustc_middle::mir::BorrowKind, state: S as gstate)]
Expand Down Expand Up @@ -1212,18 +1112,11 @@ pub enum FakeBorrowKind {

sinto_todo!(rustc_ast::ast, InlineAsmTemplatePiece);
sinto_todo!(rustc_ast::ast, InlineAsmOptions);
sinto_todo!(rustc_middle::ty, InstanceKind<'tcx>);
sinto_todo!(rustc_middle::mir, UserTypeProjections);
sinto_todo!(rustc_middle::mir, LocalInfo<'tcx>);
sinto_todo!(rustc_middle::mir, InlineAsmOperand<'tcx>);
sinto_todo!(rustc_middle::mir, AssertMessage<'tcx>);
sinto_todo!(rustc_middle::mir, UnwindAction);
sinto_todo!(rustc_middle::mir, FakeReadCause);
sinto_todo!(rustc_middle::mir, RetagKind);
sinto_todo!(rustc_middle::mir, UserTypeProjection);
sinto_todo!(rustc_middle::mir, MirSource<'tcx>);
sinto_todo!(rustc_middle::mir, CoroutineInfo<'tcx>);
sinto_todo!(rustc_middle::mir, VarDebugInfo<'tcx>);
sinto_todo!(rustc_middle::mir, UnwindTerminateReason);
sinto_todo!(rustc_middle::mir::coverage, CoverageKind);
sinto_todo!(rustc_middle::mir::interpret, ConstAllocation<'a>);
2 changes: 0 additions & 2 deletions frontend/exporter/src/types/new/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ mod full_def;
mod impl_infos;
mod item_attributes;
mod predicate_id;
mod typed_constant_kind;
mod variant_infos;

pub use full_def::*;
pub use impl_infos::*;
pub use item_attributes::*;
pub use predicate_id::*;
pub use typed_constant_kind::*;
pub use variant_infos::*;
20 changes: 0 additions & 20 deletions frontend/exporter/src/types/new/typed_constant_kind.rs
View file

This file was deleted.

Loading

0 comments on commit 54dc196

Please sign in to comment.