Skip to content

Commit c731646

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #102675 - ouz-a:mir-technical-debt, r=oli-obk
Remove `mir::CastKind::Misc` As discussed in #97649 `mir::CastKind::Misc` is not clear, this PR addresses that by creating a new enum variant for every valid cast. r? ````@oli-obk````
2 parents 6bcdf8a + d59c7ff commit c731646

25 files changed

+190
-57
lines changed

‎compiler/rustc_borrowck/src/type_check/mod.rs‎

Lines changed: 89 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,25 +2209,104 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
22092209
}
22102210
}
22112211
}
2212-
2213-
CastKind::Misc => {
2212+
CastKind::IntToInt => {
22142213
let ty_from = op.ty(body, tcx);
22152214
let cast_ty_from = CastTy::from_ty(ty_from);
22162215
let cast_ty_to = CastTy::from_ty(*ty);
2217-
// Misc casts are either between floats and ints, or one ptr type to another.
22182216
match (cast_ty_from, cast_ty_to) {
2219-
(
2220-
Some(CastTy::Int(_) | CastTy::Float),
2221-
Some(CastTy::Int(_) | CastTy::Float),
2222-
)
2223-
| (Some(CastTy::Ptr(_) | CastTy::FnPtr), Some(CastTy::Ptr(_))) => (),
2217+
(Some(CastTy::Int(_)), Some(CastTy::Int(_))) => (),
22242218
_ => {
22252219
span_mirbug!(
22262220
self,
22272221
rvalue,
2228-
"Invalid Misc cast {:?} -> {:?}",
2222+
"Invalid IntToInt cast {:?} -> {:?}",
22292223
ty_from,
2230-
ty,
2224+
ty
2225+
)
2226+
}
2227+
}
2228+
}
2229+
CastKind::IntToFloat => {
2230+
let ty_from = op.ty(body, tcx);
2231+
let cast_ty_from = CastTy::from_ty(ty_from);
2232+
let cast_ty_to = CastTy::from_ty(*ty);
2233+
match (cast_ty_from, cast_ty_to) {
2234+
(Some(CastTy::Int(_)), Some(CastTy::Float)) => (),
2235+
_ => {
2236+
span_mirbug!(
2237+
self,
2238+
rvalue,
2239+
"Invalid IntToFloat cast {:?} -> {:?}",
2240+
ty_from,
2241+
ty
2242+
)
2243+
}
2244+
}
2245+
}
2246+
CastKind::FloatToInt => {
2247+
let ty_from = op.ty(body, tcx);
2248+
let cast_ty_from = CastTy::from_ty(ty_from);
2249+
let cast_ty_to = CastTy::from_ty(*ty);
2250+
match (cast_ty_from, cast_ty_to) {
2251+
(Some(CastTy::Float), Some(CastTy::Int(_))) => (),
2252+
_ => {
2253+
span_mirbug!(
2254+
self,
2255+
rvalue,
2256+
"Invalid FloatToInt cast {:?} -> {:?}",
2257+
ty_from,
2258+
ty
2259+
)
2260+
}
2261+
}
2262+
}
2263+
CastKind::FloatToFloat => {
2264+
let ty_from = op.ty(body, tcx);
2265+
let cast_ty_from = CastTy::from_ty(ty_from);
2266+
let cast_ty_to = CastTy::from_ty(*ty);
2267+
match (cast_ty_from, cast_ty_to) {
2268+
(Some(CastTy::Float), Some(CastTy::Float)) => (),
2269+
_ => {
2270+
span_mirbug!(
2271+
self,
2272+
rvalue,
2273+
"Invalid FloatToFloat cast {:?} -> {:?}",
2274+
ty_from,
2275+
ty
2276+
)
2277+
}
2278+
}
2279+
}
2280+
CastKind::FnPtrToPtr => {
2281+
let ty_from = op.ty(body, tcx);
2282+
let cast_ty_from = CastTy::from_ty(ty_from);
2283+
let cast_ty_to = CastTy::from_ty(*ty);
2284+
match (cast_ty_from, cast_ty_to) {
2285+
(Some(CastTy::FnPtr), Some(CastTy::Ptr(_))) => (),
2286+
_ => {
2287+
span_mirbug!(
2288+
self,
2289+
rvalue,
2290+
"Invalid FnPtrToPtr cast {:?} -> {:?}",
2291+
ty_from,
2292+
ty
2293+
)
2294+
}
2295+
}
2296+
}
2297+
CastKind::PtrToPtr => {
2298+
let ty_from = op.ty(body, tcx);
2299+
let cast_ty_from = CastTy::from_ty(ty_from);
2300+
let cast_ty_to = CastTy::from_ty(*ty);
2301+
match (cast_ty_from, cast_ty_to) {
2302+
(Some(CastTy::Ptr(_)), Some(CastTy::Ptr(_))) => (),
2303+
_ => {
2304+
span_mirbug!(
2305+
self,
2306+
rvalue,
2307+
"Invalid PtrToPtr cast {:?} -> {:?}",
2308+
ty_from,
2309+
ty
22312310
)
22322311
}
22332312
}

‎compiler/rustc_codegen_cranelift/src/base.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,12 @@ fn codegen_stmt<'tcx>(
633633
lval.write_cvalue(fx, operand.cast_pointer_to(to_layout));
634634
}
635635
Rvalue::Cast(
636-
CastKind::Misc
636+
CastKind::IntToInt
637+
| CastKind::FloatToFloat
638+
| CastKind::FloatToInt
639+
| CastKind::IntToFloat
640+
| CastKind::FnPtrToPtr
641+
| CastKind::PtrToPtr
637642
| CastKind::PointerExposeAddress
638643
| CastKind::PointerFromExposedAddress,
639644
ref operand,

‎compiler/rustc_codegen_cranelift/src/constant.rs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,16 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
490490
match &stmt.kind {
491491
StatementKind::Assign(local_and_rvalue) if &local_and_rvalue.0 == place => {
492492
match &local_and_rvalue.1 {
493-
Rvalue::Cast(CastKind::Misc, operand, ty) => {
493+
Rvalue::Cast(
494+
CastKind::IntToInt
495+
| CastKind::FloatToFloat
496+
| CastKind::FloatToInt
497+
| CastKind::IntToFloat
498+
| CastKind::FnPtrToPtr
499+
| CastKind::PtrToPtr,
500+
operand,
501+
ty,
502+
) => {
494503
if computed_const_val.is_some() {
495504
return None; // local assigned twice
496505
}

‎compiler/rustc_codegen_ssa/src/mir/rvalue.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
250250
OperandValue::Pair(lldata, llextra)
251251
}
252252
mir::CastKind::Pointer(PointerCast::MutToConstPointer)
253-
| mir::CastKind::Misc
253+
| mir::CastKind::PtrToPtr
254254
if bx.cx().is_backend_scalar_pair(operand.layout) =>
255255
{
256256
if let OperandValue::Pair(data_ptr, meta) = operand.val {
@@ -290,7 +290,13 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
290290
mir::CastKind::Pointer(
291291
PointerCast::MutToConstPointer | PointerCast::ArrayToPointer,
292292
)
293-
| mir::CastKind::Misc
293+
| mir::CastKind::IntToInt
294+
| mir::CastKind::FloatToInt
295+
| mir::CastKind::FloatToFloat
296+
| mir::CastKind::IntToFloat
297+
| mir::CastKind::PtrToPtr
298+
| mir::CastKind::FnPtrToPtr
299+
294300
// Since int2ptr can have arbitrary integer types as input (so we have to do
295301
// sign extension and all that), it is currently best handled in the same code
296302
// path as the other integer-to-X casts.

‎compiler/rustc_const_eval/src/interpret/cast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
4242
let res = self.pointer_from_exposed_address_cast(&src, cast_ty)?;
4343
self.write_immediate(res, dest)?;
4444
}
45-
46-
Misc => {
45+
// FIXME: We shouldn't use `misc_cast` for these but handle them separately.
46+
IntToInt | FloatToInt | FloatToFloat | IntToFloat | FnPtrToPtr | PtrToPtr => {
4747
let src = self.read_immediate(src)?;
4848
let res = self.misc_cast(&src, cast_ty)?;
4949
self.write_immediate(res, dest)?;

‎compiler/rustc_const_eval/src/transform/check_consts/check.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
553553
unimplemented!()
554554
}
555555

556-
Rvalue::Cast(CastKind::Misc, _, _) => {}
556+
Rvalue::Cast(_, _, _) => {}
557557

558558
Rvalue::NullaryOp(NullOp::SizeOf | NullOp::AlignOf, _) => {}
559559
Rvalue::ShallowInitBox(_, _) => {}

‎compiler/rustc_const_eval/src/transform/validate.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,14 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
557557
}
558558
Rvalue::Cast(kind, operand, target_type) => {
559559
match kind {
560-
CastKind::Misc => {
560+
CastKind::DynStar => {
561+
// FIXME(dyn-star): make sure nothing needs to be done here.
562+
}
563+
// Nothing to check here
564+
CastKind::PointerFromExposedAddress
565+
| CastKind::PointerExposeAddress
566+
| CastKind::Pointer(_) => {}
567+
_ => {
561568
let op_ty = operand.ty(self.body, self.tcx);
562569
if op_ty.is_enum() {
563570
self.fail(
@@ -568,13 +575,6 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
568575
);
569576
}
570577
}
571-
CastKind::DynStar => {
572-
// FIXME(dyn-star): make sure nothing needs to be done here.
573-
}
574-
// Nothing to check here
575-
CastKind::PointerFromExposedAddress
576-
| CastKind::PointerExposeAddress
577-
| CastKind::Pointer(_) => {}
578578
}
579579
}
580580
Rvalue::Repeat(_, _)

‎compiler/rustc_middle/src/mir/mod.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,14 @@ impl<'tcx> Rvalue<'tcx> {
18341834
| Rvalue::AddressOf(_, _)
18351835
| Rvalue::Len(_)
18361836
| Rvalue::Cast(
1837-
CastKind::Misc | CastKind::Pointer(_) | CastKind::PointerFromExposedAddress,
1837+
CastKind::IntToInt
1838+
| CastKind::FloatToInt
1839+
| CastKind::FloatToFloat
1840+
| CastKind::IntToFloat
1841+
| CastKind::FnPtrToPtr
1842+
| CastKind::PtrToPtr
1843+
| CastKind::Pointer(_)
1844+
| CastKind::PointerFromExposedAddress,
18381845
_,
18391846
_,
18401847
)

‎compiler/rustc_middle/src/mir/syntax.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,8 +1149,12 @@ pub enum CastKind {
11491149
Pointer(PointerCast),
11501150
/// Cast into a dyn* object.
11511151
DynStar,
1152-
/// Remaining unclassified casts.
1153-
Misc,
1152+
IntToInt,
1153+
FloatToInt,
1154+
FloatToFloat,
1155+
IntToFloat,
1156+
PtrToPtr,
1157+
FnPtrToPtr,
11541158
}
11551159

11561160
#[derive(Clone, Debug, PartialEq, Eq, TyEncodable, TyDecodable, Hash, HashStable)]

‎compiler/rustc_middle/src/ty/cast.rs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// typeck and codegen.
33

44
use crate::ty::{self, Ty};
5+
use rustc_middle::mir;
56

67
use rustc_macros::HashStable;
78

@@ -75,3 +76,28 @@ impl<'tcx> CastTy<'tcx> {
7576
}
7677
}
7778
}
79+
80+
/// Returns `mir::CastKind` from the given parameters.
81+
pub fn mir_cast_kind<'tcx>(from_ty: Ty<'tcx>, cast_ty: Ty<'tcx>) -> mir::CastKind {
82+
let from = CastTy::from_ty(from_ty);
83+
let cast = CastTy::from_ty(cast_ty);
84+
let cast_kind = match (from, cast) {
85+
(Some(CastTy::Ptr(_) | CastTy::FnPtr), Some(CastTy::Int(_))) => {
86+
mir::CastKind::PointerExposeAddress
87+
}
88+
(Some(CastTy::Int(_)), Some(CastTy::Ptr(_))) => mir::CastKind::PointerFromExposedAddress,
89+
(_, Some(CastTy::DynStar)) => mir::CastKind::DynStar,
90+
(Some(CastTy::Int(_)), Some(CastTy::Int(_))) => mir::CastKind::IntToInt,
91+
(Some(CastTy::FnPtr), Some(CastTy::Ptr(_))) => mir::CastKind::FnPtrToPtr,
92+
93+
(Some(CastTy::Float), Some(CastTy::Int(_))) => mir::CastKind::FloatToInt,
94+
(Some(CastTy::Int(_)), Some(CastTy::Float)) => mir::CastKind::IntToFloat,
95+
(Some(CastTy::Float), Some(CastTy::Float)) => mir::CastKind::FloatToFloat,
96+
(Some(CastTy::Ptr(_)), Some(CastTy::Ptr(_))) => mir::CastKind::PtrToPtr,
97+
98+
(_, _) => {
99+
bug!("Attempting to cast non-castable types {:?} and {:?}", from_ty, cast_ty)
100+
}
101+
};
102+
cast_kind
103+
}

0 commit comments

Comments
 (0)