Skip to content

Commit 142b6fc

Browse files
committed
Auto merge of rust-lang#104370 - matthiaskrgr:rollup-c3b38sm, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#103996 (Add small clarification around using pointers derived from references) - rust-lang#104315 (Improve spans with `use crate::{self}`) - rust-lang#104320 (Use `derive_const` and rm manual StructuralEq impl) - rust-lang#104357 (add is_sized method on Abi and Layout, and use it) - rust-lang#104365 (Add x tool to triagebot) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents b4d29af + 3991db0 commit 142b6fc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/stacked_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
10531053
// pointers we need to retag, so we can stop recursion early.
10541054
// This optimization is crucial for ZSTs, because they can contain way more fields
10551055
// than we can ever visit.
1056-
if !place.layout.is_unsized() && place.layout.size < self.ecx.pointer_size() {
1056+
if place.layout.is_sized() && place.layout.size < self.ecx.pointer_size() {
10571057
return Ok(());
10581058
}
10591059

0 commit comments

Comments
 (0)