Skip to content

Commit 390bc98

Browse files
committed
Auto merge of #136564 - fmease:rollup-qcjjcm7, r=fmease
Rollup of 8 pull requests Successful merges: - #128045 (#[contracts::requires(...)] + #[contracts::ensures(...)]) - #136263 (rustdoc: clean up a bunch of ts-expected-error declarations in main) - #136375 (cg_llvm: Replace some DIBuilder wrappers with LLVM-C API bindings (part 1)) - #136392 (bootstrap: add wrapper macros for `feature = "tracing"`-gated `tracing` macros) - #136396 (rustdoc-json-types: Document that crate name isn't package name.) - #136405 (rustdoc-book: Clean up section on `--output-format`) - #136502 (Mark `std::fmt::from_fn` as `#[must_use]`) - #136509 (Add tests for nested macro_rules edition behavior) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 671cc3a + 6d3868f commit 390bc98

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/machine.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,11 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
11501150
interp_ok(ecx.tcx.sess.ub_checks())
11511151
}
11521152

1153+
#[inline(always)]
1154+
fn contract_checks(ecx: &InterpCx<'tcx, Self>) -> InterpResult<'tcx, bool> {
1155+
interp_ok(ecx.tcx.sess.contract_checks())
1156+
}
1157+
11531158
#[inline(always)]
11541159
fn thread_local_static_pointer(
11551160
ecx: &mut MiriInterpCx<'tcx>,

0 commit comments

Comments
 (0)