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

Auto merge of #1448 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup; and a bit of UnsafeCell detection refactoring
This commit is contained in:
bors 2020-06-13 09:31:32 +00:00
commit 4575ee13ca
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
50c0192c64241d723066add22c53d472e2b9cba9 1fb612bd15bb3ef098fd24c20d0727de573b4410

12
src/helpers.rs
View File

@ -291,6 +291,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
} else if self.ecx.type_is_freeze(v.layout.ty) { } else if self.ecx.type_is_freeze(v.layout.ty) {
// This is `Freeze`, there cannot be an `UnsafeCell` // This is `Freeze`, there cannot be an `UnsafeCell`
Ok(()) Ok(())
} else if matches!(v.layout.fields, FieldsShape::Union(..)) {
// A (non-frozen) union. We fall back to whatever the type says.
(self.unsafe_cell_action)(v)
} else { } else {
// We want to not actually read from memory for this visit. So, before // We want to not actually read from memory for this visit. So, before
// walking this value, we have to make sure it is not a // walking this value, we have to make sure it is not a
@ -341,13 +344,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
} }
} }
// We have to do *something* for unions. fn visit_union(&mut self, _v: MPlaceTy<'tcx, Tag>, _fields: NonZeroUsize) -> InterpResult<'tcx> {
fn visit_union(&mut self, v: MPlaceTy<'tcx, Tag>, _fields: NonZeroUsize) -> InterpResult<'tcx> { bug!("we should have already handled unions in `visit_value`")
// With unions, we fall back to whatever the type says, to hopefully be consistent
// with LLVM IR.
// FIXME: are we consistent, and is this really the behavior we want?
let frozen = self.ecx.type_is_freeze(v.layout.ty);
if frozen { Ok(()) } else { (self.unsafe_cell_action)(v) }
} }
} }
} }