Skip to content

Commit 95aed7a

Browse files
committed
Miri: make size/align_of_val work for dangling raw ptrs
1 parent 158f8d0 commit 95aed7a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

compiler/rustc_mir/src/interpret/intrinsics.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
141141
}
142142

143143
sym::min_align_of_val | sym::size_of_val => {
144-
let place = self.deref_operand(args[0])?;
144+
// Avoid `deref_operand` -- this is not a deref, the ptr does not have to be
145+
// dereferencable!
146+
let place = self.ref_to_mplace(self.read_immediate(args[0])?)?;
145147
let (size, align) = self
146-
.size_and_align_of(place.meta, place.layout)?
148+
.size_and_align_of_mplace(place)?
147149
.ok_or_else(|| err_unsup_format!("`extern type` does not have known layout"))?;
148150

149151
let result = match intrinsic_name {

compiler/rustc_mir/src/interpret/validity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl<'rt, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, '
391391
}
392392
// Make sure this is dereferenceable and all.
393393
let size_and_align = try_validation!(
394-
self.ecx.size_and_align_of(place.meta, place.layout),
394+
self.ecx.size_and_align_of_mplace(place),
395395
self.path,
396396
err_ub!(InvalidMeta(msg)) => { "invalid {} metadata: {}", kind, msg },
397397
);

0 commit comments

Comments
 (0)