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 9 pull requests #62961

Merged
merged 49 commits into from
Jul 25, 2019
Merged

Rollup of 9 pull requests #62961

merged 49 commits into from
Jul 25, 2019

Commits on Jul 16, 2019

  1. Support SDKROOT env var on iOS

    Following what clang does (https://github.com/llvm/llvm-project/blob/296a80102a9b72c3eda80558fb78a3ed8849b341/clang/lib/Driver/ToolChains/Darwin.cpp#L1661-L1678), allow allow SDKROOT to tell us where the Apple SDK lives so we don't have to invoke xcrun.
    swolchok committed Jul 16, 2019
    Configuration menu
    Copy the full SHA
    ccb5d0a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. ci: Install clang on Windows through tarballs

    Previously we used the executables built the LLVM project but these
    executables are difficult to run in a CI environment, they can
    accidentally pollute global state, etc. In testing some of the possible
    4-core machine environments for Azure this step would frequently cause
    issues.
    
    To assuage these future issues and hopefully make builds slightly more
    self-contained, this commit changes to install from a tarball instead.
    The tarball isn't provided by LLVM itself, but we use the offical LLVM
    installer to extract itself and then we pack up the LLVM installation
    directory into the tarball.
    alexcrichton committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    795f93b View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2019

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

Commits on Jul 20, 2019

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

Commits on Jul 22, 2019

  1. Ignore NLL migrate mode test in the Polonius compare-mode

    This is test specific to the NLL migrate mode which is irrelevant to -Z polonius.
    It can't currently be encoded depending on migrate-mode and NLL/Polonius mode, so the NLL compare-mode also ignores it.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    c442dae View commit details
    Browse the repository at this point in the history
  2. Ignore test issue-45983 in the polonius compare mode

    There is no difference between the NLL and Polonius outputs, and it manually tests NLLs.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    d4ca9a3 View commit details
    Browse the repository at this point in the history
  3. Ignore two-phase-reservation-sharing-interference-2.rs in Polonius co…

    …mpare mode
    
    This is just a difference from the test construction, it's ignore-compare-mode-nll and manually checks migrate/nll over edition2015/2018.
    
    This failure is because the `migrate2015` and `migrate2018`  revisions are ran with `-Zpolonius`. There is no actual difference in the errors output by NLLs and Polonius.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    273bfd4 View commit details
    Browse the repository at this point in the history
  4. Ignore feature-gate-nll.rs in Polonius compare mode

    This is a test about turning the NLL feature gate on, ignored by the NLL compare-mode.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    63c837e View commit details
    Browse the repository at this point in the history
  5. Ignore test issue-45696-scribble-on-boxed-borrow.rs in Polonius compa…

    …re mode
    
    Once again, the difference is in the test construction, it is ignored in compare-mode NLL and tested manually with revisions, and fails because the `migrate` revision is ran with `-Zpolonius`. There is no actual difference in the errors output by NLLs and Polonius.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    51c15fa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ff350f8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2824db1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9410104 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6a7c15e View commit details
    Browse the repository at this point in the history
  10. Bless output of test nll/get_default.rs for Polonius

    2 of the 3 errors are "fixed by Polonius" 🎉
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    c5a1bc1 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    292d5c1 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    6fe5292 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    7db61e7 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    08c25b5 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    9a82f52 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    6d9a4f9 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    0bd2b32 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    ed1625f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    40e6b02 View commit details
    Browse the repository at this point in the history
  20. Add test extracted from rand, checking that StorageDead kills loans

    Like "call-kills-loans", Polonius didn't know about some `killed` facts.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    9bd9b0d View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    606f798 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    9e0fb6f View commit details
    Browse the repository at this point in the history
  23. Bless output of test unboxed-closures/unboxed-closures-failed-recursi…

    …ve-fn-1.rs for Polonius
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    823ab42 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    2f3e36f View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    d41e002 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    770129c View commit details
    Browse the repository at this point in the history
  27. issue-46589 passes in Polonius and fails in NLL, duplicate it and man…

    …ually check each outcome
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    c7f9a71 View commit details
    Browse the repository at this point in the history
  28. Bless output of test nll/loan_ends_mid_block_pair.rs for Polonius, again

    Fixing assignments to projections made the Polonius output exactly the same as the NLL one.
    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    c0eab36 View commit details
    Browse the repository at this point in the history
  29. fix tidy

    lqd committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    e16bede View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    4b33968 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Configuration menu
    Copy the full SHA
    6140371 View commit details
    Browse the repository at this point in the history
  2. Require a value for configure --debuginfo-level

    In `configure.py`, using the `o` function creates an enable/disable
    boolean setting, and writes `true` or `false` in `config.toml`. However,
    rustbuild is expecting to parse a `u32` debuginfo level. We can change
    to the `v` function to have the options require a value.
    cuviper committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    1aeadcc View commit details
    Browse the repository at this point in the history
  3. fix check

    swolchok committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    a4ff823 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Configuration menu
    Copy the full SHA
    eafb42d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d749b5e View commit details
    Browse the repository at this point in the history
  3. Add comment

    swolchok committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    287db19 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#61727 - Mark-Simulacrum:crate-deps-in-deps,…

    … r=alexcrichton
    
    Add binary dependencies to dep-info files
    
    I'm not sure about the lack of incremental-tracking here, but since I'm pretty sure this runs on every compile anyway it might not matter? If there's a better place/way to get at the information I want, I'm happy to refactor the code to match.
    
    r? @alexcrichton
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    40be400 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#62736 - lqd:polonius_tests3, r=matthewjasper

    Polonius: fix some cases of `killed` fact generation, and most of the `ui` test suite
    
    Since basic Polonius functionality was re-enabled by @matthewjasper in rust-lang#54468, some tests were still failing in the polonius compare-mode.
    
    This PR fixes all but one test in the `ui` suite by:
    - fixing some bugs in the fact generation code, related to the `killed` relation: Polonius would incorrectly reject some NLL-accepted code, because of these missing `killed` facts.
    - ignoring some tests in the polonius compare-mode: a lot of those manually test the NLL or migrate mode, and the failures were mostly artifacts of the test revisions, e.g. that `-Z polonius` requires full NLLs. Some others were also both failing with NLL and succeeding with Polonius, which we can't encode in tests at the moment.
    - blessing the output of some tests: whenever Polonius and NLL have basically the same errors, except for diagnostics differences, the Polonius output is blessed. Whenever we've advanced into a less experimental phase, we'll want to revisit these cases (much like we did on the NLL test suite last year) to specifically work on diagnostics.
    
    Fact generation changes:
    - we now kill loans on the destination place of `Call` terminators
    - we now kill loans on the locals destroyed by `StorageDead`
    - we now also handle assignments to projections: killing the loans on a either a deref-ed local, or the ones whose `borrowed_place` conflicts with the current place.
    
    One failing test remains: an overflow during fact generation, on a case of polymorphic recursion (and which I'll continue investigating later).
    
    This adds some tests for the fact generation changes, with some simple Polonius cases similar to the existing smoke tests, but also for some cases encountered in the wild (in the `rand` crate for example).
    
    A more detailed write-up is available [here](https://hackmd.io/CjYB0fs4Q9CweyeTdKWyEg?view) with an explanation for each test failure, the steps taken to resolve it (as a commit in the current PR), NLL and Polonius outputs (and diff), etc.
    
    Since they've worked on this before, and we've discussed some of these failures together:
    
    r? @matthewjasper
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    a676a36 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#62758 - alexcrichton:llvm-tarball-windows, …

    …r=pietroalbini
    
    ci: Install clang on Windows through tarballs
    
    Previously we used the executables built the LLVM project but these
    executables are difficult to run in a CI environment, they can
    accidentally pollute global state, etc. In testing some of the possible
    4-core machine environments for Azure this step would frequently cause
    issues.
    
    To assuage these future issues and hopefully make builds slightly more
    self-contained, this commit changes to install from a tarball instead.
    The tarball isn't provided by LLVM itself, but we use the offical LLVM
    installer to extract itself and then we pack up the LLVM installation
    directory into the tarball.
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    5ef2162 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#62784 - Disasm:riscv32i, r=estebank

    Add riscv32i-unknown-none-elf target
    
    This target is likely to be useful for constrained FPGA soft-cores, such as picorv32 and HeavyX.
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    8d9000d View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#62814 - androm3da:hexagon_19jul_2019, r=ale…

    …xcrichton
    
    add support for hexagon-unknown-linux-musl
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    b1a8660 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#62827 - nikic:llvm-components, r=alexcrichton

    Don't link mcjit/interpreter LLVM components
    
    We don't use these. Drop related unused ExecutionEngine header uses.
    
    As some drive-by cleanup drop the unused `EnableARMEHABI` global and remove an outdated version check for the hexagon component.
    
    r? @alexcrichton
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    e559042 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#62901 - petrochenkov:serde, r=Centril

    cleanup: Remove `extern crate serialize as rustc_serialize`s
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    5a7db0e View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#62903 - swolchok:ios-sdkroot, r=alexcrichton

    Support SDKROOT env var on iOS
    
    Following what clang does (https://github.com/llvm/llvm-project/blob/296a80102a9b72c3eda80558fb78a3ed8849b341/clang/lib/Driver/ToolChains/Darwin.cpp#L1661-L1678), allow allow SDKROOT to tell us where the Apple SDK lives so we don't have to invoke xcrun.
    
    Replaces rust-lang#62551.
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    6e1ed3a View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#62906 - cuviper:debuginfo-level, r=Mark-Sim…

    …ulacrum
    
    Require a value for configure --debuginfo-level
    
    In `configure.py`, using the `o` function creates an enable/disable
    boolean setting, and writes `true` or `false` in `config.toml`. However,
    rustbuild is expecting to parse a `u32` debuginfo level. We can change
    to the `v` function to have the options require a value.
    Centril authored Jul 24, 2019
    Configuration menu
    Copy the full SHA
    0340d72 View commit details
    Browse the repository at this point in the history