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 6 pull requests #66452

Closed
wants to merge 22 commits into from
Closed

Commits on Nov 9, 2019

  1. Update cc, git2, num_cpus.

    ehuss committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    a902383 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. protect creation of destructors by a mutex

    add on HermizCore an additional lock to protect static data
    stlankes committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    969b741 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8871731 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Configuration menu
    Copy the full SHA
    b6d93d9 View commit details
    Browse the repository at this point in the history
  2. Move FatalError to syntax_pos

    This is a bit unfortunate, but code needs to be able to fatally error
    early on (in particular, syntax_pos after we move SourceMap there). It's
    also a tiny bit of code, which means it's ultimately not that bad.
    Mark-Simulacrum committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    e1a87ca View commit details
    Browse the repository at this point in the history
  3. Move SourceMap to syntax_pos

    This does not update the use sites or delete the now unnecessary
    SourceMapper trait, to allow git to interpret the file move as a rename
    rather than a new file.
    Mark-Simulacrum committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    942f0a6 View commit details
    Browse the repository at this point in the history
  4. Remove SourceMapper trait

    SourceMap is now in the root of all rustc-specific crates, syntax_pos,
    so there's no need for the trait object to decouple the dependencies
    between librustc_errors and libsyntax as was needed previously.
    Mark-Simulacrum committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    3f93ffc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c31a875 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b8dca6c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d252ba3 View commit details
    Browse the repository at this point in the history
  8. Add test for issue-36122

    JohnTitor committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    4e621a8 View commit details
    Browse the repository at this point in the history
  9. Add test for issue-58094

    JohnTitor committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    74329bf View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    564c78a View commit details
    Browse the repository at this point in the history
  11. Apply suggestion from Centril

    Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
    JohnTitor and Centril committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    09f0ee5 View commit details
    Browse the repository at this point in the history
  12. more comment

    RalfJung committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    065e1b8 View commit details
    Browse the repository at this point in the history
  13. Fix nll test

    JohnTitor committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    614abe4 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#66255 - ehuss:update-cc, r=alexcrichton

    Update cc, git2, num_cpus.
    
    This updates the `cc` crate, bringing in better parallel building support. Also updates `git2` which enables the parallel feature. (Note: I don't expect it will have a significant impact on build time, but seems good to update anyways.)
    
    The main thorn is that `cc` gained knowledge about RISC-V architectures (rust-lang/cc-rs#428, rust-lang/cc-rs#429, rust-lang/cc-rs#430), but the builders on CI do not have the riscv C compiler installed. This means that bootstraps' cc detection was finding a C compiler that isn't installed, and fails.
    
    The solution here is to override the cc detection to `false`. The C compiler isn't actually used on riscv platforms. AFAIK, the only location would be compiler_builtins, and it currently forces C support off (https://github.com/rust-lang/compiler-builtins/blob/a533ae9c5aa325db209659679535fe1f186eae81/build.rs#L49-L55).
    
    Other possible solutions:
    - Add the override in cc_detect for riscv (or any "no-C" platform like wasm32 and nvptx)
    - Install and use the appropriate c compiler. I tried this the `g++-riscv64-linux-gnu` package, but it failed missing some header file.
    
    Closes rust-lang#66232
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    fd84f03 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#66350 - hermitcore:hermit, r=rkruppe

    protect creation of destructors by a mutex
    
    - add on HermitCore an additional lock to protect static data
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    12065b1 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#66407 - JohnTitor:add-ice-tests, r=Centril

    Add more tests for fixed ICEs
    
    Closes rust-lang#36122 (fixed in 1.20.0)
    Closes rust-lang#58094 (fixed in rust-lang#66054)
    Also, fix mistaken test case, from rust-lang#30904 to rust-lang#30906 (cc @eddyb)
    
    r? @Centril
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    e2aa473 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#66415 - tmandry:force-test-in-process, r=al…

    …excrichton
    
    Add --force-run-in-process unstable option to libtest
    
    When running tests with `-Zpanic_abort_tests`, it's sometimes desirable to fall back to the old behavior of only running tests in-process. This comes in handy if the system process launcher is unavailable, or the test code somehow expects all tests to be run in the same process.
    
    For example, in Fuchsia we have unit tests that actually test the process launcher itself, in which case we can't use the process launcher to run the tests :).
    
    r? @alexcrichton
    cc @cramertj,@petrhosek
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    eaf7e97 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#66427 - Mark-Simulacrum:errors-json, r=Centril

    Move the JSON error emitter to librustc_errors
    
    This is done both as a cleanup (it makes little sense for this emitter to be in libsyntax), but also as part of broader work to decouple Session from librustc itself.
    
    Along the way, this also moves SourceMap to syntax_pos, which is also nice for the above reasons, as well as allowing dropping the SourceMapper trait from code. This had the unfortunate side-effect of moving `FatalError` to rustc_data_structures (it's needed in syntax_pos, due to SourceMap, but putting it there feels somehow worse).
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    1724afd View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#66441 - RalfJung:seh, r=oli-obk

    libpanic_unwind for Miri: make sure we have the SEH lang items when needed
    
    r? @oli-obk  @alexcrichton This is required to fix the Miri toolstate. Turns out rustc complains when doing codegen for MSVC and these lang items do not exist. For now `cfg(miri)` needs to still be able to codegen (we [plan to change that](rust-lang/miri#1048 (comment)) but that's a larger project requiring improvements to xargo and maybe also cargo; that should not block fixing the toolstate). Yes, this is a hack, but it is inside `cfg(miri)` so I hope this is okay.
    
    Cc @Aaron1011
    Centril authored Nov 15, 2019
    Configuration menu
    Copy the full SHA
    7761647 View commit details
    Browse the repository at this point in the history