Skip to content

Commit dcee529

Browse files
RalfJungRalfJung
committed
smir: merge identical Constant and ConstOperand types
1 parent ed1618d commit dcee529

File tree

5 files changed

+24
-31
lines changed

5 files changed

+24
-31
lines changed

‎compiler/rustc_smir/src/rustc_smir/convert/mir.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,13 @@ impl<'tcx> Stable<'tcx> for mir::Operand<'tcx> {
328328
}
329329

330330
impl<'tcx> Stable<'tcx> for mir::ConstOperand<'tcx> {
331-
type T = stable_mir::mir::Constant;
331+
type T = stable_mir::mir::ConstOperand;
332332

333333
fn stable(&self, tables: &mut Tables<'_>) -> Self::T {
334-
stable_mir::mir::Constant {
334+
stable_mir::mir::ConstOperand {
335335
span: self.span.stable(tables),
336336
user_ty: self.user_ty.map(|u| u.as_usize()).or(None),
337-
literal: self.const_.stable(tables),
337+
const_: self.const_.stable(tables),
338338
}
339339
}
340340
}

‎compiler/stable_mir/src/mir/body.rs

+10-17
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ pub enum AggregateKind {
637637
pub enum Operand {
638638
Copy(Place),
639639
Move(Place),
640-
Constant(Constant),
640+
Constant(ConstOperand),
641641
}
642642

643643
#[derive(Clone, Eq, PartialEq)]
@@ -653,6 +653,13 @@ impl From<Local> for Place {
653653
}
654654
}
655655

656+
#[derive(Clone, Debug, Eq, PartialEq)]
657+
pub struct ConstOperand {
658+
pub span: Span,
659+
pub user_ty: Option<UserTypeAnnotationIndex>,
660+
pub const_: MirConst,
661+
}
662+
656663
/// Debug information pertaining to a user variable.
657664
#[derive(Clone, Debug, Eq, PartialEq)]
658665
pub struct VarDebugInfo {
@@ -714,13 +721,6 @@ pub enum VarDebugInfoContents {
714721
Const(ConstOperand),
715722
}
716723

717-
#[derive(Clone, Debug, Eq, PartialEq)]
718-
pub struct ConstOperand {
719-
pub span: Span,
720-
pub user_ty: Option<UserTypeAnnotationIndex>,
721-
pub const_: MirConst,
722-
}
723-
724724
// In MIR ProjectionElem is parameterized on the second Field argument and the Index argument. This
725725
// is so it can be used for both Places (for which the projection elements are of type
726726
// ProjectionElem<Local, Ty>) and user-provided type annotations (for which the projection elements
@@ -829,13 +829,6 @@ pub type FieldIdx = usize;
829829

830830
type UserTypeAnnotationIndex = usize;
831831

832-
#[derive(Clone, Debug, Eq, PartialEq)]
833-
pub struct Constant {
834-
pub span: Span,
835-
pub user_ty: Option<UserTypeAnnotationIndex>,
836-
pub literal: MirConst,
837-
}
838-
839832
/// The possible branch sites of a [TerminatorKind::SwitchInt].
840833
#[derive(Clone, Debug, Eq, PartialEq)]
841834
pub struct SwitchTargets {
@@ -1001,9 +994,9 @@ impl Operand {
1001994
}
1002995
}
1003996

1004-
impl Constant {
997+
impl ConstOperand {
1005998
pub fn ty(&self) -> Ty {
1006-
self.literal.ty()
999+
self.const_.ty()
10071000
}
10081001
}
10091002

‎compiler/stable_mir/src/mir/pretty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ fn pretty_operand(operand: &Operand) -> String {
310310
Operand::Move(mv) => {
311311
format!("move {:?}", mv)
312312
}
313-
Operand::Constant(cnst) => pretty_mir_const(&cnst.literal),
313+
Operand::Constant(cnst) => pretty_mir_const(&cnst.const_),
314314
}
315315
}
316316

‎compiler/stable_mir/src/mir/visit.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ pub trait MirVisitor {
108108
self.super_ty(ty)
109109
}
110110

111-
fn visit_constant(&mut self, constant: &Constant, location: Location) {
112-
self.super_constant(constant, location)
111+
fn visit_const_operand(&mut self, constant: &ConstOperand, location: Location) {
112+
self.super_const_operand(constant, location)
113113
}
114114

115115
fn visit_mir_const(&mut self, constant: &MirConst, location: Location) {
@@ -366,7 +366,7 @@ pub trait MirVisitor {
366366
self.visit_place(place, PlaceContext::NON_MUTATING, location)
367367
}
368368
Operand::Constant(constant) => {
369-
self.visit_constant(constant, location);
369+
self.visit_const_operand(constant, location);
370370
}
371371
}
372372
}
@@ -380,10 +380,10 @@ pub trait MirVisitor {
380380
let _ = ty;
381381
}
382382

383-
fn super_constant(&mut self, constant: &Constant, location: Location) {
384-
let Constant { span, user_ty: _, literal } = constant;
383+
fn super_const_operand(&mut self, constant: &ConstOperand, location: Location) {
384+
let ConstOperand { span, user_ty: _, const_ } = constant;
385385
self.visit_span(span);
386-
self.visit_mir_const(literal, location);
386+
self.visit_mir_const(const_, location);
387387
}
388388

389389
fn super_mir_const(&mut self, constant: &MirConst, location: Location) {

‎tests/ui-fulldeps/stable-mir/check_transform.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern crate stable_mir;
2121
use rustc_smir::rustc_internal;
2222
use stable_mir::mir::alloc::GlobalAlloc;
2323
use stable_mir::mir::mono::Instance;
24-
use stable_mir::mir::{Body, Constant, Operand, Rvalue, StatementKind, TerminatorKind};
24+
use stable_mir::mir::{Body, ConstOperand, Operand, Rvalue, StatementKind, TerminatorKind};
2525
use stable_mir::ty::{ConstantKind, MirConst};
2626
use stable_mir::{CrateDef, CrateItems, ItemKind};
2727
use std::convert::TryFrom;
@@ -72,7 +72,7 @@ fn check_msg(body: &Body, expected: &str) {
7272
.unwrap()
7373
}
7474
};
75-
let ConstantKind::Allocated(alloc) = msg_const.literal.kind() else {
75+
let ConstantKind::Allocated(alloc) = msg_const.const_.kind() else {
7676
unreachable!()
7777
};
7878
assert_eq!(alloc.provenance.ptrs.len(), 1);
@@ -96,8 +96,8 @@ fn change_panic_msg(mut body: Body, new_msg: &str) -> Body {
9696
match &mut bb.terminator.kind {
9797
TerminatorKind::Call { args, .. } => {
9898
let new_const = MirConst::from_str(new_msg);
99-
args[0] = Operand::Constant(Constant {
100-
literal: new_const,
99+
args[0] = Operand::Constant(ConstOperand {
100+
const_: new_const,
101101
span: bb.terminator.span,
102102
user_ty: None,
103103
});

0 commit comments

Comments
 (0)