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

Miri subtree update #124193

Merged
merged 56 commits into from
Apr 21, 2024
Merged

Miri subtree update #124193

merged 56 commits into from
Apr 21, 2024

Commits on Apr 16, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    20f4182 View commit details
    Browse the repository at this point in the history

  2. Merge from rustc

    The Miri Cronjob Bot committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a1f523d View commit details
    Browse the repository at this point in the history

  3. bless test-cargo-miri

    @RalfJung
    RalfJung committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    3d3a584 View commit details
    Browse the repository at this point in the history

  4. Auto merge of rust-lang#3469 - rust-lang:rustup-2024-04-16, r=RalfJung 

    Automatic Rustup
    @bors
    bors committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    88d1a1c View commit details
    Browse the repository at this point in the history

  5. threads: keep track of why we are blocked, and sanity-check that when… 

    … waking up
    @RalfJung
    RalfJung committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    3d5aceb View commit details
    Browse the repository at this point in the history

  6. Auto merge of rust-lang#3471 - RalfJung:blocked, r=RalfJung 

    threads: keep track of why we are blocked, and sanity-check that when waking up

Also remove support for condvars blocked on rwlocks, as that was no longer used.
    @bors
    bors committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    1129fac View commit details
    Browse the repository at this point in the history

  7. deadlock: show backtrace for all threads

    @RalfJung
    RalfJung committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    811d4de View commit details
    Browse the repository at this point in the history

  8. Auto merge of rust-lang#3472 - RalfJung:deadlock, r=RalfJung 

    deadlock: show backtrace for all threads

Fixes rust-lang/miri#3424
    @bors
    bors committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    fee494b View commit details
    Browse the repository at this point in the history

  9. no_std works on Windows now

    @RalfJung
    RalfJung committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a7db628 View commit details
    Browse the repository at this point in the history

  10. Auto merge of rust-lang#3477 - RalfJung:win-no-std, r=RalfJung 

    no_std works on Windows now

Since we now properly support the magic linker section for TLS dtors, the no_std test works on Windows.
    @bors
    bors committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    7197990 View commit details
    Browse the repository at this point in the history

  11. implement support for __rust_alloc_error_handler

    @RalfJung
    RalfJung committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    f325c8d View commit details
    Browse the repository at this point in the history

  12. Auto merge of rust-lang#3478 - RalfJung:alloc_error_handler, r=RalfJung 

    implement support for __rust_alloc_error_handler

Fixes rust-lang/miri#3439
    @bors
    bors committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8ad72b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    af28716 View commit details
    Browse the repository at this point in the history

  2. Merge from rustc

    The Miri Cronjob Bot committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e873988 View commit details
    Browse the repository at this point in the history

  3. fmt

    The Miri Cronjob Bot committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2cb03ef View commit details
    Browse the repository at this point in the history

  4. alloc_error_handler tests: directly call handle_alloc_error; test mor… 

    …e codepaths
    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d10f613 View commit details
    Browse the repository at this point in the history

  5. tests/utils: add fmt::Write implementations for miri's native stdout/… 

    …stderr
    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d7f79cc View commit details
    Browse the repository at this point in the history

  6. no need to use miri's native stderr here

    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    9f156d3 View commit details
    Browse the repository at this point in the history

  7. Auto merge of rust-lang#3479 - rust-lang:rustup-2024-04-17, r=RalfJung 

    Automatic Rustup
    @bors
    bors committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    14701ef View commit details
    Browse the repository at this point in the history

  8. Auto merge of rust-lang#3480 - RalfJung:alloc_error_handler, r=RalfJung 

    directly call handle_alloc_error

Also test more codepaths. There's like 5 different things that can happen on allocation failure! Between `-Zoom`, `#[alloc_error_handler]`, and `set_alloc_error_hook`, we have 3 layers of behavior overrides. It's all a bit messy.

rust-lang#112331 seems intended to clean this up, but has not yet reached consensus.
    @bors
    bors committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    9776f64 View commit details
    Browse the repository at this point in the history

  9. Preparing for merge from rustc

    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    6a108a7 View commit details
    Browse the repository at this point in the history

  10. Merge from rustc

    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    3d3550f View commit details
    Browse the repository at this point in the history

  11. fmt

    @RalfJung
    RalfJung committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    7c3c271 View commit details
    Browse the repository at this point in the history

  12. Auto merge of rust-lang#3481 - RalfJung:rustup, r=RalfJung 

    Rustup
    @bors
    bors committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d261b53 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. add test for Drop terminator on non-drop type

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5c352a4 View commit details
    Browse the repository at this point in the history

  2. Auto merge of rust-lang#3483 - RalfJung:drop, r=RalfJung 

    add test for Drop terminator on non-drop type

Fixes rust-lang/miri#2737
    @bors
    bors committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0f44382 View commit details
    Browse the repository at this point in the history

  3. move read_byte_slice to general helpers file, next to read_c_str

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    62e84d5 View commit details
    Browse the repository at this point in the history

  4. Auto merge of rust-lang#3485 - RalfJung:read_byte_slice, r=RalfJung 

    move read_byte_slice to general helpers file, next to read_c_str
    @bors
    bors committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5697f73 View commit details
    Browse the repository at this point in the history

  5. add test checking that we do run MIR validation

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5ef38ac View commit details
    Browse the repository at this point in the history

  6. Auto merge of rust-lang#3486 - RalfJung:mir-validate, r=RalfJung 

    add test checking that we do run MIR validation

Fixes rust-lang/miri#2840
    @bors
    bors committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5c9924a View commit details
    Browse the repository at this point in the history

  7. make realloc with a size of zero fail

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    73e333a View commit details
    Browse the repository at this point in the history

  8. move allocator shim logic into its own file

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5ff9b2b View commit details
    Browse the repository at this point in the history

  9. Auto merge of rust-lang#3484 - RalfJung:realloc, r=RalfJung 

    make realloc with a size of zero fail

Fixes rust-lang/miri#2774
    @bors
    bors committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1ce64e7 View commit details
    Browse the repository at this point in the history

  10. when an address gets reused, establish a happens-before link in the d… 

    …ata race model
    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    48fd549 View commit details
    Browse the repository at this point in the history

  11. do not reuse stack addresses; make reuse rate configurable

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    d7916fc View commit details
    Browse the repository at this point in the history

  12. comment clarification and typo fix

    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    5067dd2 View commit details
    Browse the repository at this point in the history

  13. Auto merge of rust-lang#3488 - RalfJung:os_str_comment, r=RalfJung 

    os_str: comment clarification and typo fix
    @bors
    bors committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    39f0c4f View commit details
    Browse the repository at this point in the history

  14. when reusing an address, most of the time only reuse from the current… 

    … thread
    @RalfJung
    RalfJung committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    9b419a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    c1cf0a3 View commit details
    Browse the repository at this point in the history

  2. Merge from rustc

    The Miri Cronjob Bot committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d0783e8 View commit details
    Browse the repository at this point in the history

  3. share code between win-to-unix and unix-to-win path conversion

    @RalfJung
    RalfJung committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    b9ed4cd View commit details
    Browse the repository at this point in the history

  4. Auto merge of rust-lang#3490 - RalfJung:paths, r=RalfJung 

    share code between win-to-unix and unix-to-win path conversion
    @bors
    bors committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    134ee30 View commit details
    Browse the repository at this point in the history

  5. make test not leak rustc crate hash

    @RalfJung
    RalfJung committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    fecd7fc View commit details
    Browse the repository at this point in the history

  6. Auto merge of rust-lang#3489 - rust-lang:rustup-2024-04-19, r=RalfJung 

    Automatic Rustup
    @bors
    bors committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    95ae2dd View commit details
    Browse the repository at this point in the history

  7. Auto merge of rust-lang#3475 - RalfJung:reduce-reuse-recycle, r=RalfJung 

    Address reuse improvements and fixes

- when an address gets reused, establish a happens-before link in the data race model
- do not reuse stack addresses, and make the reuse rate configurable

Fixes rust-lang/miri#3450
    @bors
    bors committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    e9ebc6f View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Preparing for merge from rustc

    The Miri Cronjob Bot committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    29e41fb View commit details
    Browse the repository at this point in the history

  2. Merge from rustc

    The Miri Cronjob Bot committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    b63bb1b View commit details
    Browse the repository at this point in the history

  3. fix clippy warning

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    8e1f18d View commit details
    Browse the repository at this point in the history

  4. re-bless tests

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    7952316 View commit details
    Browse the repository at this point in the history

  5. Auto merge of rust-lang#3494 - rust-lang:rustup-2024-04-20, r=RalfJung 

    Automatic Rustup
    @bors
    bors committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    9713ff4 View commit details
    Browse the repository at this point in the history

  6. data_race: make the release/acquire API more clear

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    7dcfb54 View commit details
    Browse the repository at this point in the history

  7. reuse_pool: only do acquire_clock if we reused from a different thread

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    cb1b4a6 View commit details
    Browse the repository at this point in the history

  8. restrict VClock API surface

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    8cab0d5 View commit details
    Browse the repository at this point in the history

  9. Auto merge of rust-lang#3495 - RalfJung:data-race-clocks, r=RalfJung 

    data_race: make the release/acquire API more clear
    @bors
    bors committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    6b0ce8b View commit details
    Browse the repository at this point in the history

  10. ensure the ICE-to-file logic does not affect our test

    @RalfJung
    RalfJung committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    61a7d3d View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. the mir-validation ICE test behaves strangely on Windows hosts 

    let's just disable it there, this code is not platform-dependent anyway
    @RalfJung
    RalfJung committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    ae37b6e View commit details
    Browse the repository at this point in the history