Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update Miri #104051

Merged
merged 26 commits into from
Nov 11, 2022
Merged

update Miri #104051

merged 26 commits into from
Nov 11, 2022

Commits on Oct 29, 2022

  1. teach ./miri how to do Josh syncs

    @RalfJung
    RalfJung committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    4f3a988 View commit details
    Browse the repository at this point in the history

  2. merge rustup-toolchain into ./miri

    @RalfJung
    RalfJung committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    39598e4 View commit details
    Browse the repository at this point in the history

  3. explain how to go back to rustup-managed Miri

    @RalfJung
    RalfJung committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    2a3a53b View commit details
    Browse the repository at this point in the history

  4. Auto merge of rust-lang#2635 - RalfJung:rustup-managed-miri, r=RalfJung 

    explain how to go back to rustup-managed Miri

Fixes rust-lang/miri#2633
    @bors
    bors committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    18a23a5 View commit details
    Browse the repository at this point in the history

  5. Auto merge of rust-lang#2634 - RalfJung:miri-script, r=oli-obk 

    ./miri updates: toolchain, rustc-push, rustc-pull

This merges the `./rustup-toolchain` script into `./miri` as `./miri toolchain`, and adds two new commands for josh-based syncing.

r? `@rust-lang/miri`
    @bors
    bors committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    79a48ce View commit details
    Browse the repository at this point in the history

  6. Stacked Borrows: make scalar field retagging the default

    @RalfJung
    RalfJung committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    1470e99 View commit details
    Browse the repository at this point in the history

  7. Auto merge of rust-lang#2636 - RalfJung:scalar-field-retag, r=oli-obk 

    Stacked Borrows: make scalar field retagging the default

I think it is time to finally close this soundness gap. Any objections? :)

Unfortunately the latest released versions of hashbrown and scopeguard can fail under full field retagging. The fixes have landed in the git repos but have not been released yet. I don't know if scalar field retagging as enabled by this PR is sufficient to cause problems with these crates, but it seems likely that this would be the case -- e.g. if both `value` and `dropfn` are scalars, the entire scopeguard struct will be a `ScalarPair` and thus get field retagging.

However, given that we actually generate LLVM `noalias` for these cases, it seems prudent to inform users of this risk. They can easily set `-Zmiri-field-retag=none` to opt-out of this change.

Cc rust-lang/miri#2528
    @bors
    bors committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    c162fd3 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2022

  1. Merge from rustc

    @RalfJung
    RalfJung committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    bfe23b9 View commit details
    Browse the repository at this point in the history

  2. rustup

    @RalfJung
    RalfJung committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    0b49a5d View commit details
    Browse the repository at this point in the history

  3. Auto merge of rust-lang#2639 - RalfJung:rustup, r=RalfJung 

    Rustup
    @bors
    bors committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    962bf63 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2022

  1. fix dupe word typos

    @Rageking8
    Rageking8 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    41c368b View commit details
    Browse the repository at this point in the history

  2. add acquire when init once is already complete

    @beepster4096
    beepster4096 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    224dff4 View commit details
    Browse the repository at this point in the history

  3. Auto merge of rust-lang#2640 - Rageking8:fix-dupe-word-typos, r=saethlin 

    Fix dupe word typos
    @bors
    bors committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    21669d2 View commit details
    Browse the repository at this point in the history

  4. followup for pr 2640

    @Rageking8
    Rageking8 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    a1cd279 View commit details
    Browse the repository at this point in the history

  5. Auto merge of rust-lang#2642 - Rageking8:followup-for-pr-2640, r=Ralf… 

    …Jung

Followup for pr 2640

r? `@RalfJung`
    @bors
    bors committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    02c5ded View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. fix ./miri bench

    @RalfJung
    RalfJung committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    9554907 View commit details
    Browse the repository at this point in the history

  2. Auto merge of rust-lang#2645 - RalfJung:miri-bench, r=RalfJung 

    fix ./miri bench

Fixes rust-lang/miri#2643
    @bors
    bors committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    9d9157e View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. refactor into private functions

    @beepster4096
    beepster4096 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    fa1b720 View commit details
    Browse the repository at this point in the history

  2. clarify no_data_race_after_complete test

    @beepster4096
    beepster4096 committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    cb6f7a6 View commit details
    Browse the repository at this point in the history

  3. Auto merge of rust-lang#2641 - DrMeepster:init_once_acquire, r=RalfJung 

    InitOnce: synchronize with completion when already complete

The completion of an InitOnce happens-before the threads waiting on it wake up. However, this is not the case for threads that call `InitOnceBeginInitialize` after the completion, leading to data races and outdated weak memory loads as observed in the CI for  rust-lang#2638. This PR fixes this.
    @bors
    bors committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    4492c02 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2022

  1. Merge from rustc

    @RalfJung
    RalfJung committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    83239c2 View commit details
    Browse the repository at this point in the history

  2. Auto merge of rust-lang#2650 - RalfJung:rustup, r=RalfJung 

    Rustup
    @bors
    bors committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    7910caf View commit details
    Browse the repository at this point in the history

  3. impl condvars for windows

    @beepster4096
    beepster4096 committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    a1d94d4 View commit details
    Browse the repository at this point in the history

  4. use enum for condvar locks

    @beepster4096
    beepster4096 committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    a2f7e84 View commit details
    Browse the repository at this point in the history

  5. fix shared behavior and add tests

    @beepster4096
    beepster4096 committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    2eb07a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Auto merge of rust-lang#2638 - DrMeepster:windows-condvars, r=RalfJung 

    Implement condvars for Windows

Adds 3 shims for Windows: `SleepConditionVariableSRW`, `WakeConditionVariable`, `WakeAllConditionVariable` to add support for condvars (which fixes rust-lang#2628).

Salvaged from what was removed from rust-lang#2231
    @bors
    bors committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    f60a2ae View commit details
    Browse the repository at this point in the history