Skip to content

Commit e784c4d

Browse files
committed
Auto merge of #108677 - matthiaskrgr:rollup-i91cxuf, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #108022 (Support allocations with non-Box<[u8]> bytes) - #108367 (Re-apply "switch to the macos-12-xl builder") - #108557 (Point error span at Some constructor argument when trait resolution fails) - #108573 (Explain compile-time vs run-time difference in env!() error message) - #108584 (Put backtick content from rustdoc search errors into a `<code>` elements) - #108624 (Make `ExprKind` the first field in `thir::Expr`) - #108644 (Allow setting hashmap toml values in `./configure`) - #108672 (Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3a38500 + bb739b6 commit e784c4d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/machine.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,11 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
777777

778778
type Provenance = Provenance;
779779
type ProvenanceExtra = ProvenanceExtra;
780+
type Bytes = Box<[u8]>;
780781

781782
type MemoryMap = MonoHashMap<
782783
AllocId,
783-
(MemoryKind<MiriMemoryKind>, Allocation<Provenance, Self::AllocExtra>),
784+
(MemoryKind<MiriMemoryKind>, Allocation<Provenance, Self::AllocExtra, Self::Bytes>),
784785
>;
785786

786787
const GLOBAL_KIND: Option<MiriMemoryKind> = Some(MiriMemoryKind::Global);

0 commit comments

Comments
 (0)