Skip to content

Commit fbfe190

Browse files
committed
Auto merge of #138768 - matthiaskrgr:rollup-nfu3cm3, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #137357 (Document results of non-positive logarithms) - #138650 (Optimize `io::Write::write_fmt` for constant strings) - #138694 (Fix: add ohos target notes) - #138713 (interpret memory access hooks: also pass through the Pointer used for the access) - #138724 (Check attrs: Don't try to retrieve the name of list stems) - #138743 (bootstrap: add `--ci` flag) - #138751 (Fix the "used_with_archive" test on Fuchsia) - #138754 (Handle spans of `~const`, `const` and `async` trait bounds in macro expansion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7b19cf3 + 594aaa1 commit fbfe190

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/machine.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
13661366
_tcx: TyCtxtAt<'tcx>,
13671367
machine: &Self,
13681368
alloc_extra: &AllocExtra<'tcx>,
1369+
_ptr: Pointer,
13691370
(alloc_id, prov_extra): (AllocId, Self::ProvenanceExtra),
13701371
range: AllocRange,
13711372
) -> InterpResult<'tcx> {
@@ -1390,6 +1391,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
13901391
_tcx: TyCtxtAt<'tcx>,
13911392
machine: &mut Self,
13921393
alloc_extra: &mut AllocExtra<'tcx>,
1394+
_ptr: Pointer,
13931395
(alloc_id, prov_extra): (AllocId, Self::ProvenanceExtra),
13941396
range: AllocRange,
13951397
) -> InterpResult<'tcx> {
@@ -1414,6 +1416,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
14141416
_tcx: TyCtxtAt<'tcx>,
14151417
machine: &mut Self,
14161418
alloc_extra: &mut AllocExtra<'tcx>,
1419+
_ptr: Pointer,
14171420
(alloc_id, prove_extra): (AllocId, Self::ProvenanceExtra),
14181421
size: Size,
14191422
align: Align,

0 commit comments

Comments
 (0)