Skip to content

Commit b91a126

Browse files
RalfJungRalfJung
committed
update genmc output
1 parent 582eddc commit b91a126

29 files changed

+284
-233
lines changed

‎tests/genmc/fail/atomics/atomic_ptr_double_free.stderr‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,32 @@ help: ALLOC was deallocated here:
1717
|
1818
LL | dealloc(ptr as *mut u8, Layout::new::<u64>())
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20-
= note: BACKTRACE (of the first span) on thread `unnamed-ID`:
21-
= note: inside `free` at tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC
22-
note: inside closure
20+
note: error occurred on thread `unnamed-ID`, inside `free`
21+
--> tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC
22+
|
23+
LL | unsafe fn free(ptr: *mut u64) {
24+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25+
note: which got called inside closure
2326
--> tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC
2427
|
2528
LL | free(b);
2629
| ^^^^^^^
27-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
28-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC}>`
30+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
31+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/atomics/atomic_ptr_double_free.rs:LL:CC}>`
2932
--> tests/genmc/fail/atomics/../../../utils/genmc.rs:LL:CC
3033
|
3134
LL | f();
3235
| ^^^
36+
note: which got called indirectly due to this code
37+
--> tests/genmc/fail/atomics/../../../utils/genmc.rs:LL:CC
38+
|
39+
LL | / libc::pthread_create(
40+
LL | | &raw mut thread_id,
41+
LL | | attr,
42+
LL | | thread_func::<F>,
43+
LL | | Box::into_raw(f) as *mut c_void,
44+
LL | | )
45+
| |_________^
3346

3447
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
3548

‎tests/genmc/fail/data_race/atomic_ptr_alloc_race.dealloc.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | dealloc(b as *mut u8, Layout::new::<u64>());
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
2029

‎tests/genmc/fail/data_race/atomic_ptr_alloc_race.write.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | *b = 42;
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_alloc_race.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.stderr‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,27 @@ help: ALLOC was deallocated here:
1717
|
1818
LL | }),
1919
| ^
20-
= note: BACKTRACE (of the first span) on thread `unnamed-ID`:
21-
= note: inside closure at tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC
22-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
23-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC}>`
20+
note: error occurred on thread `unnamed-ID`, inside closure
21+
--> tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC
22+
|
23+
LL | spawn_pthread_closure(|| {
24+
| ^^
25+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
26+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_dealloc_write_race.rs:LL:CC}>`
2427
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
2528
|
2629
LL | f();
2730
| ^^^
31+
note: which got called indirectly due to this code
32+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
33+
|
34+
LL | / libc::pthread_create(
35+
LL | | &raw mut thread_id,
36+
LL | | attr,
37+
LL | | thread_func::<F>,
38+
LL | | Box::into_raw(f) as *mut c_void,
39+
LL | | )
40+
| |_________^
2841

2942
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
3043

‎tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | }),
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/atomic_ptr_write_dealloc_race.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/data_race/mpu2_rels_rlx.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | X = 2;
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/mpu2_rels_rlx.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/data_race/weak_orderings.rel_rlx.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | X = 2;
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/data_race/weak_orderings.rlx_acq.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | X = 2;
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/data_race/weak_orderings.rlx_rlx.stderr‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ LL | X = 2;
77
|
88
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
99
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
10-
= note: BACKTRACE on thread `unnamed-ID`:
11-
= note: inside closure at tests/genmc/fail/data_race/weak_orderings.rs:LL:CC
12-
= note: inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` at RUSTLIB/alloc/src/boxed.rs:LL:CC
13-
note: inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
10+
= note: this is on thread `unnamed-ID`, inside closure
11+
= note: which got called inside `<std::boxed::Box<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}> as std::ops::FnOnce<()>>::call_once` (at RUSTLIB/alloc/src/boxed.rs:LL:CC)
12+
note: which got called inside `genmc::spawn_pthread_closure::thread_func::<{closure@tests/genmc/fail/data_race/weak_orderings.rs:LL:CC}>`
1413
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
1514
|
1615
LL | f();
1716
| ^^^
17+
note: which got called indirectly due to this code
18+
--> tests/genmc/fail/data_race/../../../utils/genmc.rs:LL:CC
19+
|
20+
LL | / libc::pthread_create(
21+
LL | | &raw mut thread_id,
22+
LL | | attr,
23+
LL | | thread_func::<F>,
24+
LL | | Box::into_raw(f) as *mut c_void,
25+
LL | | )
26+
| |_________^
1827

1928
note: add `-Zmiri-genmc-print-genmc-output` to MIRIFLAGS to see the detailed GenMC error report
2029

‎tests/genmc/fail/loom/buggy_inc.stderr‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ error: abnormal termination: the program aborted execution
44
|
55
LL | std::process::abort();
66
| ^^^^^^^^^^^^^^^^^^^^^ abnormal termination occurred here
7+
|
8+
= note: this is on thread `main`
79

810
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
911

0 commit comments

Comments
 (0)