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 4 pull requests #66948

Closed
wants to merge 28 commits into from
Closed

Commits on Nov 27, 2019

  1. Configuration menu
    Copy the full SHA
    c2c4dc1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6159505 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e15e2e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    473f908 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45e7c94 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6c8fb6e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e370753 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6de254d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d57c15f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    6862a84 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    880f905 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    49bed20 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    0e70c4d View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    8be241f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    30edd33 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    5bdcde2 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    4140720 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    3315d70 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    0232114 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    3e7a5a4 View commit details
    Browse the repository at this point in the history
  21. comment

    RalfJung committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    2869aba View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2019

  1. rustbuild: fix cross-compile install

    although, not sure why this works - it wasn't needed before
    infinity0 committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    a9dca3b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0533249 View commit details
    Browse the repository at this point in the history
  3. Conditional compilation for sanitizers

    Configure sanitize option when compiling with a sanitizer to make
    it possible to execute different code depending on whether given
    sanitizer is enabled or not.
    tmiasko committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    c703ff2 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Rollup merge of rust-lang#65947 - eddyb:fn-abi, r=oli-obk,nagisa

    rustc: split FnAbi's into definitions/direct calls ("of_instance") and indirect calls ("of_fn_ptr").
    
    After this PR:
    * `InstanceDef::Virtual` is only used for "direct" virtual calls, and shims around those calls use `InstanceDef::ReifyShim` (i.e. for `<dyn Trait as Trait>::f as fn(_)`)
      * this could easily be done for intrinsics as well, to allow their reification, but I didn't do it
    * `FnAbi::of_instance` is **always** used for declaring/defining an `fn`, and for direct calls to an `fn`
      * this is great for e.g. rust-lang#65881 (`#[track_caller]`), which can introduce the "caller location" argument into "codegen signatures" by only changing `FnAbi::of_instance`, after this PR
    * `FnAbi::of_fn_ptr` is used primarily for indirect calls, i.e. to `fn` pointers
      * *not* virtual calls (which use `FnAbi::of_instance` with `InstanceDef::Virtual`)
      * there's also a couple uses where the `rustc_codegen_llvm` needs to declare (i.e. FFI-import) an LLVM function that has no Rust declaration available at all
        * at least one of them could probably be a "weak lang item" instead
    
    As there are many steps, this PR is best reviewed commit by commit - some of which arguably should be in their own PRs, I may have gotten carried away a bit.
    
    cc @nagisa @rkruppe @oli-obk @anp
    RalfJung authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    67a049d View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#66245 - tmiasko:cfg-sanitize, r=oli-obk

    Conditional compilation for sanitizers
    
    Configure sanitize option when compiling with a sanitizer to make
    it possible to execute different code depending on whether given
    sanitizer is enabled or not.
    RalfJung authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    7a75bbf View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#66827 - RalfJung:miri-missing-ret-place, r=…

    …oli-obk
    
    handle diverging functions forwarding their return place
    
    Fixes rust-lang/miri#1075: the shim around diverging closures turned into function pointers actually "obtains" a return place inside a diverging function, but just uses it as the return place for a diverging callee. Handle this by using NULL places.
    
    This is kind of a hack as it breaks our invariant that all places are dereferencable, but we'd eventually let raw pointers break that anyway I assume so that seems fine.
    
    r? @oli-obk
    RalfJung authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    92c6187 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#66834 - infinity0:master, r=Mark-Simulacrum

    rustbuild fixes
    
    When upgrading Debian's rustc to 1.38 I needed these patches:
    
    (1) In order to cross-compile rustc 1.38 and take it through the full rustbuild process including install, I needed the first patch.
    
    (2) In order to build rustc 1.38 using rustc 1.38 itself I need to set --cap-lints warn, otherwise I get this error:
    
    ~~~~
    error: unnecessary `unsafe` block
       --> src/bootstrap/builder.rs:148:19
        |
    148 |             name: unsafe { ::std::intrinsics::type_name::<S>() },
        |                   ^^^^^^ unnecessary `unsafe` block
        |
    note: lint level defined here
       --> src/bootstrap/lib.rs:107:9
        |
    107 | #![deny(warnings, rust_2018_idioms, unused_lifetimes)]
        |         ^^^^^^^^
        = note: `#[deny(unused_unsafe)]` implied by `#[deny(warnings)]`
    
    error: aborting due to previous error
    
    error: could not compile `bootstrap`.
    
    ~~~~
    
    In order to set --cap-lints warn however, I need bootstrap.py not to clobber RUSTFLAGS. (This worked previously, not sure if it was broken intentionally but we would like support for it.)
    RalfJung authored Dec 2, 2019
    Configuration menu
    Copy the full SHA
    60c42a3 View commit details
    Browse the repository at this point in the history