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 10 pull requests #120068

Merged
merged 25 commits into from
Jan 18, 2024
Merged

Rollup of 10 pull requests #120068

merged 25 commits into from
Jan 18, 2024

Commits on Jan 7, 2024

  1. Configuration menu
    Copy the full SHA
    c4b1054 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da235ce View commit details
    Browse the repository at this point in the history
  3. Fix comment.

    cjgillot committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    3082028 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1d6723a View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Enable Static Builds for FreeBSD

    Enable crt-static for FreeBSD to enable statically compiled binaries.
    Nathan Reller authored and Nathan Reller committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    adce3fd View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Configuration menu
    Copy the full SHA
    9a8f117 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee370a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Configuration menu
    Copy the full SHA
    3599c18 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    450cb5e View commit details
    Browse the repository at this point in the history
  3. add test for non-defining use of TAIT in foreign function item

    Lukas Markeffsky committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    22833c1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e12101c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Configuration menu
    Copy the full SHA
    37a5464 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19d6f06 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    db7125f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d6b99b9 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#115291 - cjgillot:dest-prop-save, r=JakobDegen

    Save liveness results for DestinationPropagation
    
    `DestinationPropagation` needs to verify that merge candidates do not conflict with each other. This is done by verifying that a local is not live when its counterpart is written to.
    
    To get the liveness information, the pass runs `MaybeLiveLocals` dataflow analysis repeatedly, once for each propagation round. This is quite costly, and the main driver for the perf impact on `ucd` and `diesel`. (See rust-lang#115105 (comment))
    
    In order to mitigate this cost, this PR proposes to save the result of the analysis into a `SparseIntervalMatrix`, and mirror merges of locals into that matrix: `liveness(destination) := liveness(destination) union liveness(source)`.
    
    <details>
    <summary>Proof</summary>
    
    We denote by `'` all the quantities of the transformed program. Let $\varphi$ be a mapping of locals, which maps `source` to `destination`, and is identity otherwise. The exact liveness set after a statement is $out'(statement)$, and the proposed liveness set is $\varphi(out(statement))$.
    
    Consider a statement. Suppose that the output state verifies $out' \subset phi(out)$. We want to prove that $in' \subset \varphi(in)$ where $in = (out - kill) \cup gen$, and conclude by induction.
    
    We have 2 cases: either that statement is kept with locals renumbered by $\varphi$, or it is a tautological assignment and it removed.
    
    1. If the statement is kept: the gen-set and the kill-set of $statement' = \varphi(statement)$ are $gen' = \varphi(gen)$ and $kill' = \varphi(kill)$ exactly.
    From soundness requirement 3, $\varphi(in)$ is disjoint from $\varphi(kill)$.
    This implies that $\varphi(out - kill)$ is disjoint from $\varphi(kill)$, and so $\varphi(out - kill) = \varphi(out) - \varphi(kill)$. Then $\varphi(in) = (\varphi(out) - \varphi(kill)) \cup \varphi(gen) = (\varphi(out) - kill') \cup gen'$.
    We can conclude that $out' \subset \varphi(out) \implies in' \subset \varphi(in)$.
    
    2. If the statement is removed. As $\varphi(statement)$ is a tautological assignment, we know that $\varphi(gen) = \varphi(kill) = \\{ destination \\}$, while $gen' = kill' = \emptyset$. So $\varphi(in) = \varphi(out) \cup \\{ destination \\}$. Then $in' = out' \subset out \subset \varphi(in)$.
    
    By recursion, we can conclude by that $in' \subset \varphi(in)$ everywhere.
    </details>
    
    This approximate liveness results is only suboptimal if there are locals that fully disappear from the CFG due to an assignment cycle. These cases are quite unlikely, so we do not bother with them.
    
    This change allows to reduce the perf impact of DestinationPropagation by half on diesel and ucd (rust-lang#115105 (comment)).
    
    cc ````@JakobDegen````
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3ae7ab6 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#119855 - rellerreller:freebsd-static, r=wes…

    …leywiser
    
    Enable Static Builds for FreeBSD
    
    Enable crt-static for FreeBSD to enable statically compiled binaries.
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c9779af View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#119975 - lukas-code:inferring-return-types-…

    …and-opaque-types-do-mix-sometimes, r=compiler-errors
    
    Don't ICE if TAIT-defining fn contains a closure with `_` in return type
    
    The `delay_span_bug` got added in rust-lang@0e82aae to reduce the amount of errors emitted for functions that have `_` in their return type, because inference doesn't apply to function items. But this logic shouldn't apply to closures, because their return types *can* be inferred.
    
    Fixes rust-lang#119916.
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    22f1913 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#120001 - dtolnay:bootstrapbootstrap, r=onur…

    …-ozkan
    
    Consistently unset RUSTC_BOOTSTRAP when compiling bootstrap
    
    Since rust-lang#113906, all x.py invocations performed by rust-analyzer have RUSTC_BOOTSTRAP=1 set. This was to fix rust-lang#112391 (comment) &mdash; rust-analyzer uses some default cargo from the system when fetching workspace layout, and the standard library uses some unstable cargo feature, so x.py would previously fail if the system toolchain wasn't nightly.
    
    https://github.com/rust-lang/rust/blob/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/Cargo.toml#L1
    
    This PR changes x.py to cancel out this RUSTC_BOOTSTRAP=1 when compiling bootstrap. It will only remain set when running the compiled bootstrap executable. This fixes spurious bootstrap rebuilds in the event that a rust-analyzer x.py invocation is alternated with someone running x.py themself on the command line, if any dependency of bootstrap looks at `option_env!("RUSTC_BOOTSTRAP")`, which is the case since rust-lang#119654.
    
    **Before:**
    
    ```console
    $ RUSTC_BOOTSTRAP=1 ./x.py check library/core
    Building bootstrap
       Compiling proc-macro2 v1.0.76
       Compiling quote v1.0.35
       Compiling syn v2.0.48
       Compiling clap_derive v4.4.7
       Compiling serde_derive v1.0.195
       Compiling clap v4.4.13
       Compiling clap_complete v4.4.6
       Compiling build_helper v0.1.0
       Compiling bootstrap v0.0.0
        Finished dev [unoptimized] target(s) in 6.31s
    Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu)
        Finished release [optimized] target(s) in 0.23s
    Build completed successfully in 0:00:07
    
    $ ./x.py check library/core
    Building bootstrap
       Compiling proc-macro2 v1.0.76
       Compiling quote v1.0.35
       Compiling syn v2.0.48
       Compiling clap_derive v4.4.7
       Compiling serde_derive v1.0.195
       Compiling clap v4.4.13
       Compiling clap_complete v4.4.6
       Compiling build_helper v0.1.0
       Compiling bootstrap v0.0.0
        Finished dev [unoptimized] target(s) in 5.30s
    Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu)
        Finished release [optimized] target(s) in 0.25s
    Build completed successfully in 0:00:06
    ```
    
    **After:**
    
    ```console
    $ RUSTC_BOOTSTRAP=1 ./x.py check library/core
    Building bootstrap
        Finished dev [unoptimized] target(s) in 0.06s
    Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu)
        Finished release [optimized] target(s) in 0.14s
    Build completed successfully in 0:00:01
    
    $ ./x.py check library/core
    Building bootstrap
        Finished dev [unoptimized] target(s) in 0.04s
    Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu)
        Finished release [optimized] target(s) in 0.13s
    Build completed successfully in 0:00:01
    ```
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    cc9a4a2 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#120020 - oli-obk:long_const_eval_err_taint,…

    … r=compiler-errors
    
    Gracefully handle missing typeck information if typeck errored
    
    fixes rust-lang#116893
    
    I created some logs and the typeck of `fn main` is exactly the same, no matter whether the constant's body is what it is, or if it is replaced with `panic!()`. The latter will cause the ICE not to be emitted though. The reason for that is that we abort compilation if *errors* were emitted, but not if *lint errors* were emitted. This took me way too long to debug, and is another reason why I would have liked rust-lang/compiler-team#633
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    6ca77ff View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#120031 - compiler-errors:construct-closure-…

    …ty-eagerly, r=oli-obk
    
    Construct closure type eagerly
    
    Construct the returned closure type *before* checking the body, in the same match as we were previously deducing the coroutine types based off of the closure kind.
    
    This simplifies some changes I'm doing in the async closure PR, and imo just seems easier to read (since we only need one match on closure kind, instead of two). There's no reason I can tell that we needed to create the closure type *after* the body was checked.
    
    ~~This also has the side-effect of making it so that the universe of the closure synthetic infer vars are lower than any infer vars that come from checking the body. We can also get rid of `next_root_ty_var` hack from closure checking (though in general we still need this, rust-lang#119106). cc ```@lcnr``` since you may care about this hack 😆~~
    
    r? ```@oli-obk```
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    cd5eb6a View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#120032 - Nadrieril:fix-rustc_abi, r=Nilstrieb

    Fix `rustc_abi` build on stable
    
    rust-lang#119446 broke the ability of `rustc_abi` to build on stable, which is required by rust-analyzer. This fixes it.
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e0aa4df View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#120039 - Nadrieril:remove-idx, r=compiler-e…

    …rrors
    
    pat_analysis: Don't rely on contiguous `VariantId`s outside of rustc
    
    Today's pattern_analysis uses `BitSet` and `IndexVec` on the provided enum variant ids, which only makes sense if these ids count the variants from 0. In rust-analyzer, the variant ids are global interning ids, which would make `BitSet` and `IndexVec` ridiculously wasteful. In this PR I add some shims to use `FxHashSet`/`FxHashMap` instead outside of rustc.
    
    r? ```@compiler-errors```
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3a3242a View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#120044 - Storyyeller:patch-2, r=lqd

    Fix typo in comments (in_place_collect)
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    a2eefd2 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#120056 - oli-obk:arg_mismatch_ice, r=compil…

    …er-errors
    
    Use FnOnceOutput instead of FnOnce where expected
    
    fixes rust-lang#119847
    matthiaskrgr committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    99a8b6a View commit details
    Browse the repository at this point in the history