Skip to content

Commit 5982e9d

Browse files
committed
downgrade some assertions to debug_ again
1 parent 6f568e7 commit 5982e9d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/librustc_mir/interpret/memory.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
195195
kind: MemoryKind<M::MemoryKinds>,
196196
) -> Pointer<M::PointerTag> {
197197
let id = self.tcx.alloc_map.lock().reserve();
198-
assert_ne!(
198+
debug_assert_ne!(
199199
Some(kind),
200200
M::STATIC_KIND.map(MemoryKind::Machine),
201201
"dynamically allocating static memory"

src/librustc_mir/interpret/place.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1130,10 +1130,12 @@ where
11301130
let layout = self.layout_of(ty)?;
11311131

11321132
// More sanity checks
1133-
let (size, align) = self.read_size_and_align_from_vtable(vtable)?;
1134-
assert_eq!(size, layout.size);
1135-
// only ABI alignment is preserved
1136-
assert_eq!(align, layout.align.abi);
1133+
if cfg!(debug_assertions) {
1134+
let (size, align) = self.read_size_and_align_from_vtable(vtable)?;
1135+
assert_eq!(size, layout.size);
1136+
// only ABI alignment is preserved
1137+
assert_eq!(align, layout.align.abi);
1138+
}
11371139

11381140
let mplace = MPlaceTy { mplace: MemPlace { meta: MemPlaceMeta::None, ..*mplace }, layout };
11391141
Ok((instance, mplace))

0 commit comments

Comments
 (0)