Skip to content

Commit 79c169d

Browse files
committed
disable one check for now until rust-lang#96185 is fixed
1 parent 7196556 commit 79c169d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

compiler/rustc_const_eval/src/interpret/operand.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
284284
Abi::Scalar(s) if force => Some(s.primitive()),
285285
_ => None,
286286
};
287-
if let Some(s) = scalar_layout {
288-
let size = s.size(self);
289-
assert_eq!(size, mplace.layout.size, "abi::Scalar size does not match layout size");
287+
if let Some(_s) = scalar_layout {
288+
//FIXME(#96185): let size = s.size(self);
289+
//FIXME(#96185): assert_eq!(size, mplace.layout.size, "abi::Scalar size does not match layout size");
290+
let size = mplace.layout.size; //FIXME(#96185): remove this line
290291
let scalar = alloc.read_scalar(alloc_range(Size::ZERO, size))?;
291292
return Ok(Some(ImmTy { imm: scalar.into(), layout: mplace.layout }));
292293
}

compiler/rustc_const_eval/src/interpret/place.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ where
759759
)
760760
};
761761
let size = s.size(&tcx);
762-
assert_eq!(dest.layout.size, size, "abi::Scalar size does not match layout size");
762+
//FIXME(#96185): assert_eq!(dest.layout.size, size, "abi::Scalar size does not match layout size");
763763
alloc.write_scalar(alloc_range(Size::ZERO, size), scalar)
764764
}
765765
Immediate::ScalarPair(a_val, b_val) => {

0 commit comments

Comments
 (0)