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 11 pull requests #73669

Merged
merged 37 commits into from
Jun 24, 2020
Merged

Rollup of 11 pull requests #73669

merged 37 commits into from
Jun 24, 2020

Commits on May 30, 2020

  1. Configuration menu
    Copy the full SHA
    b97487b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2d6267a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Mention that BTreeMap::new() doesn't allocate

    I think it would be nice to mention this, so you don't have to dig through the src to look at the definition of new().
    TrolledWoods authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    0c5c644 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Merge pull request rust-lang#4 from rust-lang/master

    update from origin 2020-06-18
    richkadel authored Jun 18, 2020
    Configuration menu
    Copy the full SHA
    7ef9eb3 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. Merge pull request rust-lang#5 from rust-lang/master

    update from origin 2020-06-19
    richkadel authored Jun 19, 2020
    Configuration menu
    Copy the full SHA
    791cccc View commit details
    Browse the repository at this point in the history
  2. code coverage foundation for hash and num_counters

    Replaced dummy values for hash and num_counters with computed values,
    and refactored InstrumentCoverage pass to simplify injecting more
    counters per function in upcoming versions.
    
    Improved usage documentation and error messaging.
    richkadel committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    8c7c84b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8fc2eeb View commit details
    Browse the repository at this point in the history
  4. Look for stores between non-conflicting generator saved locals

    This is to prevent the miscompilation in rust-lang#73137 from reappearing.
    Only runs with `-Zvalidate-mir`.
    ecstatic-morse committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    c178e64 View commit details
    Browse the repository at this point in the history
  5. Incorporate review suggestions

    Co-authored-by: Tyler Mandry <[email protected]>
    ecstatic-morse and tmandry committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    b2ec645 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2020

  1. Fix -Z unpretty=everybody_loops

    It turns out that this has not been working for who knows how long.
    Previously:
    
    ```
    pub fn h() { 1 + 2; }
    ```
    
    After this change:
    
    ```
    pub fn h() { loop {} }
    ```
    
    This only affected the pass when run with the command line
    pretty-printing option, so rustdoc was still replacing bodies with
    `loop {}`.
    jyn514 committed Jun 20, 2020
    Configuration menu
    Copy the full SHA
    95f8daa View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2020

  1. Configuration menu
    Copy the full SHA
    f60513e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1d3f49f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bd4f6f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Configuration menu
    Copy the full SHA
    933fe80 View commit details
    Browse the repository at this point in the history
  2. fix intrinsics::needs_drop docs

    lcnr authored Jun 22, 2020
    Configuration menu
    Copy the full SHA
    932237b View commit details
    Browse the repository at this point in the history
  3. Point at the call spawn when overflow occurs during monomorphization

    This improves the output for issue rust-lang#72577, but there's still more work
    to be done.
    
    Currently, an overflow error during monomorphization results in an error
    that points at the function we were unable to monomorphize. However, we
    don't point at the call that caused the monomorphization to happen. In
    the overflow occurs in a large recursive function, it may be difficult
    to determine where the issue is.
    
    This commit tracks and `Span` information during collection of
    `MonoItem`s, which is used when emitting an overflow error. `MonoItem`
    itself is unchanged, so this only affects
    `src/librustc_mir/monomorphize/collector.rs`
    Aaron1011 committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    3ed96a6 View commit details
    Browse the repository at this point in the history
  4. implemented query for coverage data

    This commit adds a query that allows the CoverageData to be pulled from
    a call on tcx, avoiding the need to change the
    `codegen_intrinsic_call()` signature (no need to pass in the FunctionCx
    or any additional arguments.
    
    The commit does not change where/when the CoverageData is computed. It's
    still done in the `pass`, and saved in the MIR `Body`.
    
    See discussion (in progress) here:
    rust-lang#73488 (comment)
    richkadel committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    f4a7938 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f84b7e1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    994d9d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2020

  1. Configuration menu
    Copy the full SHA
    08ec4cb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3d0192e View commit details
    Browse the repository at this point in the history
  3. using "mir_body" (vs "body") in InstrumentCoverage

    The mod uses both MIR bodies and HIR bodies, so I'm trying to maintain
    consistency with these names.
    richkadel committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    a045140 View commit details
    Browse the repository at this point in the history
  4. Updated query for num_counters to compute from max index

    Also added FIXME comments to note the possible need to accommodate
    counter increment calls in source-based functions that differ from the
    function context of the caller instance (e.g., inline functions).
    richkadel committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    977ce57 View commit details
    Browse the repository at this point in the history
  5. The const propagator cannot trace references.

    Thus we avoid propagation of a local the moment we encounter references to it.
    oli-obk committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    5fa8b08 View commit details
    Browse the repository at this point in the history
  6. rustc: Modernize wasm checks for atomics

    This commit modernizes how rustc checks for whether the `atomics`
    feature is enabled for the wasm target. The `sess.target_features` set
    is consulted instead of fiddling around with dealing with various
    aspects of LLVM and that syntax.
    alexcrichton committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    0c2b025 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6e8aa1f View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#72780 - GuillaumeGomez:enforce-doc-alias-ch…

    …eck, r=ollie27
    
    Enforce doc alias check
    
    Part of rust-lang#50146.
    
    r? @ollie27
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    7d2fba1 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#72876 - TrolledWoods:patch-2, r=Dylan-DPC

    Mention that BTreeMap::new() doesn't allocate
    
    I think it would be nice to mention this, so you don't have to dig through the src to look at the definition of new().
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    317a151 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#73244 - ecstatic-morse:validate-generator-m…

    …ir, r=tmandry
    
    Check for assignments between non-conflicting generator saved locals
    
    This is to prevent future changes to the generator transform from reintroducing the problem that caused rust-lang#73137. Namely, a store between two generator saved locals whose storage does not conflict.
    
    My ultimate goal is to introduce a modified version of rust-lang#71956 that handles this case properly.
    
    r? @tmandry
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    781b589 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#73488 - richkadel:llvm-coverage-map-gen, r=…

    …tmandry
    
    code coverage foundation for hash and num_counters
    
    This PR is the next iteration after PR rust-lang#73011 (which is still waiting on bors to merge).
    
    @wesleywiser - PTAL
    r? @tmandry
    
    (FYI, I'm also working on injecting the coverage maps, in another branch, while waiting for these to merge.)
    
    Thanks!
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    f5e46fe View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#73523 - jyn514:everybody_loops, r=ecstatic-…

    …morse
    
    Fix -Z unpretty=everybody_loops
    
    It turns out that this has not been working for who knows how long.
    Previously:
    
    ```
    pub fn h() { 1 + 2; }
    ```
    
    After this change:
    
    ```
    pub fn h() { loop { } }
    ```
    
    This only affected the pass when run with the command line
    pretty-printing option, so rustdoc was still replacing bodies with
    `loop {}`.
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    505cf52 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#73587 - marmeladema:hir-id-ification-final,…

    … r=petrochenkov
    
    Move remaining `NodeId` APIs from `Definitions` to `Resolver`
    
    Implements rust-lang#73291 (comment)
    
    TL;DR: it moves all fields that are only needed during name resolution passes into the `Resolver` and keep the rest in `Definitions`. This effectively enforces that all references to `NodeId`s are gone once HIR lowering is completed.
    
    After this, the only remaining work for rust-lang#50928 should be to adjust the dev guide.
    
    r? @petrochenkov
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    045761c View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#73601 - Aaron1011:fix/better-mono-overflow-…

    …err, r=ecstatic-morse
    
    Point at the call span when overflow occurs during monomorphization
    
    This improves the output for issue rust-lang#72577, but there's still more work
    to be done.
    
    Currently, an overflow error during monomorphization results in an error
    that points at the function we were unable to monomorphize. However, we
    don't point at the call that caused the monomorphization to happen. In
    the overflow occurs in a large recursive function, it may be difficult
    to determine where the issue is.
    
    This commit tracks and `Span` information during collection of
    `MonoItem`s, which is used when emitting an overflow error. `MonoItem`
    itself is unchanged, so this only affects
    `src/librustc_mir/monomorphize/collector.rs`
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    30fba22 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#73613 - oli-obk:const_prop_miscompile, r=we…

    …sleywiser
    
    The const propagator cannot trace references.
    
    Thus we avoid propagation of a local the moment we encounter references to it.
    
    fixes rust-lang#73609
    
    cc @RalfJung
    
    r? @wesleywiser
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    d8b4604 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#73614 - lcnr:patch-4, r=Dylan-DPC

    fix `intrinsics::needs_drop` docs
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    f7d5687 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#73630 - estebank:fn-item-e0308, r=davidtwco

    Provide context on E0308 involving fn items
    
    Fix rust-lang#73487.
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    4f2e540 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#73665 - alexcrichton:update-wasm-atomics-fe…

    …ature, r=davidtwco
    
    rustc: Modernize wasm checks for atomics
    
    This commit modernizes how rustc checks for whether the `atomics`
    feature is enabled for the wasm target. The `sess.target_features` set
    is consulted instead of fiddling around with dealing with various
    aspects of LLVM and that syntax.
    Manishearth authored Jun 23, 2020
    Configuration menu
    Copy the full SHA
    6ed6a84 View commit details
    Browse the repository at this point in the history