mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exhaustively match on the mutability and nestedness

Browse Source
This commit is contained in:
Oli Scherer 2024-03-11 17:50:26 +00:00
parent bbbf06d5e9
commit bbedde835e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_const_eval/src/interpret/validity.rs
View File

@ -483,12 +483,14 @@ impl<'rt, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, '
} }
// Return alloc mutability. For "root" statics we look at the type to account for interior // Return alloc mutability. For "root" statics we look at the type to account for interior
// mutability; for nested statics we have no type and directly use the annotated mutability. // mutability; for nested statics we have no type and directly use the annotated mutability.
match self.ecx.tcx.def_kind(did) { let DefKind::Static { mutability, nested } = self.ecx.tcx.def_kind(did)
DefKind::Static { mutability: Mutability::Mut, .. } => Mutability::Mut, else {
DefKind::Static { mutability: Mutability::Not, nested: true } => { bug!()
Mutability::Not };
} match (mutability, nested) {
DefKind::Static { mutability: Mutability::Not, nested: false } (Mutability::Mut, _) => Mutability::Mut,
(Mutability::Not, true) => Mutability::Not,
(Mutability::Not, false)
if !self if !self
.ecx .ecx
.tcx .tcx
@ -499,7 +501,7 @@ impl<'rt, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, '
{ {
Mutability::Mut Mutability::Mut
} }
_ => Mutability::Not, (Mutability::Not, false) => Mutability::Not,
} }
} }
GlobalAlloc::Memory(alloc) => alloc.inner().mutability, GlobalAlloc::Memory(alloc) => alloc.inner().mutability,