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.

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

update Miri #111454

Merged
merged 42 commits into from
May 11, 2023
Merged

update Miri #111454

merged 42 commits into from
May 11, 2023

Commits on Apr 30, 2023

  1. Auto merge of rust-lang#2864 - RalfJung:rustup, r=RalfJung

    Rustup
    
    My previous rustup PR was broken. I didn't realize that "nothing to commit, working tree clean" meant "I didn't actually do the full pull properly, stop and inspect manually"...
    bors committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    e285f76 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Configuration menu
    Copy the full SHA
    d20fa00 View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed May 2, 2023
    Configuration menu
    Copy the full SHA
    3942cdf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    12fd42a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e0114e7 View commit details
    Browse the repository at this point in the history
  5. Auto merge of rust-lang#2869 - oli-obk:only_interp_compiling_code, r=…

    …RalfJung
    
    Avoid interpreting code that has lint errors
    
    fixes rust-lang#2608
    
    we previously only checked for actual errors, as deny lints are handled differently.
    bors committed May 2, 2023
    Configuration menu
    Copy the full SHA
    9db11c9 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    59477cc View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed May 3, 2023
    Configuration menu
    Copy the full SHA
    3951a02 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cfd7eaa View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Configuration menu
    Copy the full SHA
    9ce6cfb View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed May 5, 2023
    Configuration menu
    Copy the full SHA
    4062fe2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8ab4803 View commit details
    Browse the repository at this point in the history
  4. update dependencies

    RalfJung committed May 5, 2023
    Configuration menu
    Copy the full SHA
    f5fa50f View commit details
    Browse the repository at this point in the history
  5. Auto merge of rust-lang#2875 - RalfJung:rustup, r=RalfJung

    Rustup
    
    This *should* fail because of rust-lang/miri#2874 but it seems we don't actually cover that in our tests...
    bors committed May 5, 2023
    Configuration menu
    Copy the full SHA
    42b14dc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fd30862 View commit details
    Browse the repository at this point in the history
  7. Auto merge of rust-lang#2876 - RalfJung:varnames, r=RalfJung

    clearer variable names in data_race
    bors committed May 5, 2023
    Configuration menu
    Copy the full SHA
    457a7a8 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. Simplify Tree Borrows event filtering by getting the Range from RangeMap

    Co-authored-by: Ralf Jung <post@ralfj.de>
    Vanille-N and RalfJung committed May 6, 2023
    Configuration menu
    Copy the full SHA
    0677cd0 View commit details
    Browse the repository at this point in the history
  2. Auto merge of rust-lang#2867 - Vanille-N:tb-diags, r=RalfJung

    Simplify event selection in TB diagnostics
    
    As discussed previously, getting the range from `RangeMap` can make the filtering of events much simpler without any user-visible diff.
    
    See minor exception in [<9d8fc00>](rust-lang/miri@9d8fc00) and decide how to resolve it
    - add a boolean flag not to record events produced by deallocations ?
    - add a `help: deallocation counts as an implicit write` ? (Note: could be generalized to also include `help: reborrow counts as an implicit read`)
    - not bother and keep as-is ?
    - something else ?
    bors committed May 6, 2023
    Configuration menu
    Copy the full SHA
    dd9df18 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. Configuration menu
    Copy the full SHA
    ce3a2e5 View commit details
    Browse the repository at this point in the history
  2. Merge from rustc

    RalfJung committed May 7, 2023
    Configuration menu
    Copy the full SHA
    e476f7a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3d5a516 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Configuration menu
    Copy the full SHA
    1db8540 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64d4fd5 View commit details
    Browse the repository at this point in the history
  3. port tests to 2021 edition

    RalfJung committed May 8, 2023
    Configuration menu
    Copy the full SHA
    3309f12 View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#2880 - RalfJung:sync, r=RalfJung

    increase timing slack for sync tests; port tests to 2021 edition
    bors committed May 8, 2023
    Configuration menu
    Copy the full SHA
    a477b81 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Update to latest ui_test crate version.

    Also stops using github actions groups that conflict with our groups as github does not nest them
    oli-obk committed May 9, 2023
    Configuration menu
    Copy the full SHA
    37c3af4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    44e86e7 View commit details
    Browse the repository at this point in the history
  3. Document some arguments

    oli-obk committed May 9, 2023
    Configuration menu
    Copy the full SHA
    f321c8d View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#2884 - oli-obk:ui_test, r=RalfJung,oli-obk

    Update to latest ui_test crate version.
    
    Also stops using github actions groups that conflict with our groups as github does not nest them
    bors committed May 9, 2023
    Configuration menu
    Copy the full SHA
    84f80f1 View commit details
    Browse the repository at this point in the history
  5. Thorough merge after GC

    including accurate eq impl for UniMap
    
    Co-authored-by: Ralf Jung <post@ralfj.de>
    Vanille-N and RalfJung committed May 9, 2023
    Configuration menu
    Copy the full SHA
    1a4690d View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Configuration menu
    Copy the full SHA
    c3e7ff4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f1624a View commit details
    Browse the repository at this point in the history
  3. Auto merge of rust-lang#2865 - Vanille-N:tb-perf, r=RalfJung

    Thorough merge after GC: fix of rust-lang#2863
    
    Context: rust-lang#2863.
    
    `perf report`s of `MIRIFLAGS=-Zmiri-tree-borrows cargo +miri miri test test_invalid_name_lengths` in crate `http`:
    
    ### Pre
    ```
      91.06%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::Tree::keep_only_needed
       2.99%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::TreeVisitor::traverse_parents_this
       0.91%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::Tree::perform_access
       0.62%  rustc    miri                                 [.] miri::range_map::RangeMap<T>::iter_mut
       0.17%  rustc    libc.so.6                            [.] realloc
       0.14%  rustc    miri                                 [.] miri::concurrency::thread::EvalContextExt::run_threads
       0.13%  rustc    miri                                 [.] rustc_const_eval::interpret::operand::<impl rustc_const_eval::interpret::eva
       0.13%  rustc    miri                                 [.] hashbrown::raw::RawTable<T,A>::remove_entry
       0.10%  rustc    miri                                 [.] miri::intptrcast::GlobalStateInner::alloc_base_addr
       0.08%  rustc    librustc_driver-c82c1dc22c817a10.so  [.] <rustc_middle::mir::Body>::source_info
    ```
    Interrupted after 3min 30s.
    
    ### Post
    ```
      20.75%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::TreeVisitor::traverse_parents_this
      18.50%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::Tree::keep_only_needed
       6.49%  rustc    miri                                 [.] miri::borrow_tracker::tree_borrows::tree::Tree::perform_access
       4.25%  rustc    miri                                 [.] miri::range_map::RangeMap<T>::iter_mut
       1.91%  rustc    libc.so.6                            [.] realloc
       1.79%  rustc    miri                                 [.] miri::concurrency::thread::EvalContextExt::run_threads
       1.40%  rustc    miri                                 [.] rustc_const_eval::interpret::operand::<impl rustc_const_eval::interpret::eva
       1.40%  rustc    miri                                 [.] miri::range_map::RangeMap<T>::merge_adjacent_thorough
       1.34%  rustc    miri                                 [.] miri::intptrcast::GlobalStateInner::alloc_base_addr
       0.90%  rustc    librustc_driver-c82c1dc22c817a10.so  [.] <rustc_middle::ty::context::CtxtInterners>::intern_ty
    ```
    Terminates after 1min 13s.
    
    No significant changes to `./miri bench` in either direction: on small benches not enough garbage accumulates for this to be relevant.
    bors committed May 10, 2023
    Configuration menu
    Copy the full SHA
    7fb4332 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    53801d3 View commit details
    Browse the repository at this point in the history
  5. Merge from rustc

    RalfJung committed May 10, 2023
    Configuration menu
    Copy the full SHA
    efa68d0 View commit details
    Browse the repository at this point in the history
  6. fmt

    RalfJung committed May 10, 2023
    Configuration menu
    Copy the full SHA
    96491a9 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    68c7d20 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7a41eac View commit details
    Browse the repository at this point in the history
  9. Explain the padding

    saethlin committed May 10, 2023
    Configuration menu
    Copy the full SHA
    f9a4213 View commit details
    Browse the repository at this point in the history
  10. Auto merge of rust-lang#2879 - saethlin:measureme, r=RalfJung

    Include the current Crate name in the measureme output name
    
    See https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/measureme.20flamegraph.20panics/near/356367013
    cc `@andjo403`
    
    Currently, attempting to use `MIRIFLAGS=-Zmiri-measureme=miri cargo miri test` on a crate with multiple test targets (which is very common) will produce a corrupted measureme output file, because the various interpreter processes will stomp each other's output.
    
    This change does not entirely prevent this, but the various test targets seem to always have different crate names, so if nothing else this will make the broken measureme files much harder to encounter by accident, while also making it clear what they are all for.
    bors committed May 10, 2023
    Configuration menu
    Copy the full SHA
    d2ea42f View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. update lockfile

    RalfJung committed May 11, 2023
    Configuration menu
    Copy the full SHA
    2c88ee8 View commit details
    Browse the repository at this point in the history
  2. fix deny_lint test

    RalfJung committed May 11, 2023
    Configuration menu
    Copy the full SHA
    b0b76a5 View commit details
    Browse the repository at this point in the history