Skip to content

Commit 9a10ab4

Browse files
committed
Auto merge of #121804 - GuillaumeGomez:rollup-jh0v3ex, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #119748 (Increase visibility of `join_path` and `split_paths`) - #120820 (Enable CMPXCHG16B, SSE3, SAHF/LAHF and 128-bit Atomics (in nightly) in Windows x64) - #121000 (pattern_analysis: rework how we hide empty private fields) - #121376 (Skip unnecessary comparison with half-open range patterns) - #121596 (Use volatile access instead of `#[used]` for `on_tls_callback`) - #121669 (Count stashed errors again) - #121783 (Emitter cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 53ff07e + 47cd0d2 commit 9a10ab4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
6868
queries: &'tcx rustc_interface::Queries<'tcx>,
6969
) -> Compilation {
7070
queries.global_ctxt().unwrap().enter(|tcx| {
71-
if tcx.sess.dcx().has_errors().is_some() {
71+
if tcx.sess.dcx().has_errors_or_delayed_bugs().is_some() {
7272
tcx.dcx().fatal("miri cannot be run on programs that fail compilation");
7373
}
7474

0 commit comments

Comments
 (0)