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

Rollup of 7 pull requests #125824

Merged
merged 22 commits into from
May 31, 2024
Merged

Rollup of 7 pull requests #125824

merged 22 commits into from
May 31, 2024

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    077a821 View commit details
    Browse the repository at this point in the history
  2. Make drop-use fact collection simpler for polonius

    This shunts all the complexity of siphoning off the drop-use facts
    into `LivenessResults::add_extra_drop_facts()`, which may or may
    not be a good approach.
    amandasystems committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e155646 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8066ebc View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Configuration menu
    Copy the full SHA
    dabd05b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa563c1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    20174e6 View commit details
    Browse the repository at this point in the history
  4. coverage: Instrument the RHS value of lazy logical operators

    When a lazy logical operator (`&&` or `||`) occurs outside of an `if`
    condition, it normally doesn't have any associated control-flow branch, so we
    don't have an existing way to track whether it was true or false.
    
    This patch adds special code to handle this case, by inserting extra MIR blocks
    in a diamond shape after evaluating the RHS. This gives us a place to insert
    the appropriate marker statements, which can then be given their own counters.
    Zalathar committed May 30, 2024
    Configuration menu
    Copy the full SHA
    35a8746 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Also InstSimplify &raw*

    We do this for `&*` and `&mut*` already; might as well do it for raw pointers too.
    scottmcm committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4b96e44 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    06c4cc4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    befcdec View commit details
    Browse the repository at this point in the history
  4. Add an alternate --demangle mode to coverage-dump

    The coverage-dump tool already needs `rustc_demangle` for its own purposes, so
    the amount of extra code needed for a demangle mode is very small.
    Zalathar committed May 31, 2024
    Configuration menu
    Copy the full SHA
    9abfebd View commit details
    Browse the repository at this point in the history
  5. Use coverage-dump --demangle as the demangler for coverage-run tests

    This avoids the need to build `rust-demangler` when running coverage tests,
    since we typically need to build `coverage-dump` anyway.
    Zalathar committed May 31, 2024
    Configuration menu
    Copy the full SHA
    10ffc22 View commit details
    Browse the repository at this point in the history
  6. Use Builder::tool_exe to build the coverage-dump tool

    This appears to be the canonical way to build a tool with the stage 0 compiler.
    Zalathar committed May 31, 2024
    Configuration menu
    Copy the full SHA
    feb8f3c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    54b6849 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    20699fe View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#125652 - amandasystems:you-dropped-somethin…

    …g, r=oli-obk
    
    Revert propagation of drop-live information from Polonius
    
    rust-lang#64749 introduced a flow of drop-use data from Polonius to `LivenessResults::add_extra_drop_facts()`, which makes `LivenessResults` agree with Polonius on liveness in the presence of free regions that may be dropped. Later changes accidentally removed this flow. This PR restores it.
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4b41136 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#125730 - mu001999-contrib:clippy-fix, r=oli…

    …-obk
    
    Apply `x clippy --fix` and `x fmt` on Rustc
    
    <!--
    If this PR is related to an unstable feature or an otherwise tracked effort,
    please link to the relevant tracking issue here. If you don't know of a related
    tracking issue or there are none, feel free to ignore this.
    
    This PR will get automatically assigned to a reviewer. In case you would like
    a specific user to review your work, you can assign it to them by using
    
        r​? <reviewer name>
    -->
    
    Just run `x clippy --fix` and `x fmt`, and remove some changes like `impl Default`.
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    e904660 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#125756 - Zalathar:branch-on-bool, r=oli-obk

    coverage: Optionally instrument the RHS of lazy logical operators
    
    (This is an updated version of rust-lang#124644 and rust-lang#124402. Fixes rust-lang#124120.)
    
    When `||` or `&&` is used outside of a branching context (such as the condition of an `if`), the rightmost value does not directly influence any branching decision, so branch coverage instrumentation does not treat it as its own true-or-false branch.
    
    That is a correct and useful interpretation of “branch coverage”, but might be undesirable in some contexts, as described at rust-lang#124120. This PR therefore adds a new coverage level `-Zcoverage-options=condition` that behaves like branch coverage, but also adds additional branch instrumentation to the right-hand-side of lazy boolean operators.
    
    ---
    
    As discussed at rust-lang#124120 (comment), this is mainly intended as an intermediate step towards fully-featured MC/DC instrumentation. It's likely that we'll eventually want to remove this coverage level (rather than stabilize it), either because it has been incorporated into MC/DC instrumentation, or because it's getting in the way of future MC/DC work. The main appeal of landing it now is so that work on tracking conditions can proceed concurrently with other MC/DC-related work.
    
    ````@rustbot```` label +A-code-coverage
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    7667a91 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#125776 - compiler-errors:translate-args, r=…

    …lcnr
    
    Stop using `translate_args` in the new solver
    
    It was unnecessary and also sketchy, since it was doing an out-of-search-graph fulfillment loop. Added a test for the only really minor subtlety of translating args, though not sure if it was being tested before, though I wouldn't be surprised if it wasn't.
    
    r? lcnr
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    5109a76 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#125796 - scottmcm:more-inst-simplify, r=oli…

    …-obk
    
    Also InstSimplify `&raw*`
    
    We do this for `&*` and `&mut*` already; might as well do it for raw pointers too.
    
    r? mir-opt
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    234ed6a View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#125807 - oli-obk:resolve_const_types, r=com…

    …piler-errors
    
    Also resolve the type of constants, even if we already turned it into an error constant
    
    error constants can still have arbitrary types, and in this case it was turned into an error constant because there was an infer var in the *type* not the *const*.
    
    fixes rust-lang#125760
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    619b3e8 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#125816 - Zalathar:demangler, r=oli-obk

    Don't build the `rust-demangler` binary for coverage tests
    
    The coverage-run tests invoke `llvm-cov`, which requires us to specify a command-line demangler that it can use to demangle Rust symbol names.
    
    Historically this used `src/tools/rust-demangler`, which means that we currently build two different command-line tools to help with the coverage tests (`rust-demangler` and `coverage-dump`).
    
    However, it occurred to me that if we add a demangler mode to `coverage-dump` (which is only a handful of lines and no extra dependencies), then we only need to build one helper binary for the coverage tests, and there is no need for tests to build `rust-demangler` at all.
    
    ---
    
    Note that the `rust-demangler` binary is separate from the `rustc-demangle` crate (which both `rust-demangler` and `coverage-dump` use as a dependency to do the actual demangling).
    
    ---
    
    So the main benefits/motivations here are:
    - Slightly faster builds after a fresh checkout or bootstrap bump.
    - Making it clear that currently no tests actually need the `rust-demangler` binary, since the coverage tests can use their own tool instead.
    matthiaskrgr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    df9cd17 View commit details
    Browse the repository at this point in the history