Skip to content

Commit fad5a6e

Browse files
committed
epoch: Remove ptr-to-int casts
1 parent 4b949c2 commit fad5a6e

File tree

5 files changed

+169
-90
lines changed

5 files changed

+169
-90
lines changed

ci/miri.sh

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,29 @@ export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"
1313
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
1414
cargo miri test \
1515
-p crossbeam-queue \
16-
-p crossbeam-utils 2>&1 | ts -i '%.s '
16+
-p crossbeam-utils \
17+
-p crossbeam-channel 2>&1 | ts -i '%.s '
1718

18-
# -Zmiri-ignore-leaks is needed because we use detached threads in tests/docs: https://github.com/rust-lang/miri/issues/1371
19-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-ignore-leaks" \
19+
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
20+
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows" \
2021
cargo miri test \
21-
-p crossbeam-channel 2>&1 | ts -i '%.s '
22+
-p crossbeam-epoch 2>&1 | ts -i '%.s '
2223

23-
# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
24+
# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/614
2425
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
2526
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-isolation -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks" \
2627
cargo miri test \
27-
-p crossbeam-epoch \
2828
-p crossbeam-skiplist 2>&1 | ts -i '%.s '
2929

30-
# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
3130
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
3231
# -Zmiri-compare-exchange-weak-failure-rate=0.0 is needed because some sequential tests (e.g.,
3332
# doctest of Stealer::steal) incorrectly assume that sequential weak CAS will never fail.
3433
# -Zmiri-preemption-rate=0 is needed because this code technically has UB and Miri catches that.
35-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-ignore-leaks -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
34+
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-compare-exchange-weak-failure-rate=0.0 -Zmiri-preemption-rate=0" \
3635
cargo miri test \
3736
-p crossbeam-deque 2>&1 | ts -i '%.s '
3837

39-
# -Zmiri-ignore-leaks is needed for https://github.com/crossbeam-rs/crossbeam/issues/579
40-
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-ignore-leaks" \
38+
# -Zmiri-disable-stacked-borrows is needed for https://github.com/crossbeam-rs/crossbeam/issues/545
39+
MIRIFLAGS="-Zmiri-symbolic-alignment-check -Zmiri-disable-stacked-borrows" \
4140
cargo miri test \
4241
-p crossbeam 2>&1 | ts -i '%.s '

0 commit comments

Comments
 (0)