Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c50c62d

Browse files
committedMar 17, 2023
Auto merge of #109241 - saethlin:miri, r=oli-obk
update Miri r? `@oli-obk`
2 parents 2d64f22 + 3831a25 commit c50c62d

File tree

111 files changed

+3785
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+3785
-203
lines changed
 

‎src/tools/miri/rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c4e0cd966062ca67daed20775f4e8a60c28e57df
1+
511364e7874dba9649a264100407e4bffe7b5425

‎src/tools/miri/src/bin/miri.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use rustc_middle::{
3232
};
3333
use rustc_session::{config::CrateType, search_paths::PathKind, CtfeBacktrace};
3434

35-
use miri::{BacktraceStyle, ProvenanceMode, RetagFields};
35+
use miri::{BacktraceStyle, BorrowTrackerMethod, ProvenanceMode, RetagFields};
3636

3737
struct MiriCompilerCalls {
3838
miri_config: miri::MiriConfig,
@@ -317,6 +317,8 @@ fn main() {
317317
miri_config.validate = false;
318318
} else if arg == "-Zmiri-disable-stacked-borrows" {
319319
miri_config.borrow_tracker = None;
320+
} else if arg == "-Zmiri-tree-borrows" {
321+
miri_config.borrow_tracker = Some(BorrowTrackerMethod::TreeBorrows);
320322
} else if arg == "-Zmiri-disable-data-race-detector" {
321323
miri_config.data_race_detector = false;
322324
miri_config.weak_memory_emulation = false;
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.