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 #112130

Closed
wants to merge 14 commits into from

Commits on May 26, 2023

  1. Configuration menu
    Copy the full SHA
    6674dcd View commit details
    Browse the repository at this point in the history
  2. Stop normalizing so many different prefixes

    Previously, we would normalize *all* of
    - the absolute path to the repository checkout
    - the /rustc/$sha for stage1 (if `remap-debuginfo` was enabled)
    - the /rustc/$sha for download-rustc
    - the sysroot for download-rustc
    
    Now, we consistently only normalize /rustc/FAKE_PREFIX. Not only is this
    much simpler, but it also avoids ongoing maintenance for download-rustc
    and makes it much less likely that tests break by accident.
    
    - Change `tests/ui/track-diagnostics/track6.rs` to use a relative path
      instead of an absolute one. I am not actually sure why `track_caller`
    works here, but it does seem to work 🤷
    
    - Pass `-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX` to all
      suites, not just UI. In particular, mir-opt tests emit /rustc/ paths
      in their output.
    jyn514 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    157d936 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2023

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

Commits on May 29, 2023

  1. Configuration menu
    Copy the full SHA
    74a6803 View commit details
    Browse the repository at this point in the history
  2. fix diagnostic message

    fee1-dead committed May 29, 2023
    Configuration menu
    Copy the full SHA
    5d2f4a1 View commit details
    Browse the repository at this point in the history
  3. Add a distinct OperandValue::ZeroSized variant for ZSTs

    These tend to have special handling in a bunch of places anyway, so the variant helps remember that.  And I think it's easier to grok than non-Scalar Aggregates sometimes being `Immediates` (like I got wrong and caused 109992).  As a minor bonus, it means we don't need to generate poison LLVM values for them to pass around in `OperandValue::Immediate`s.
    scottmcm committed May 29, 2023
    Configuration menu
    Copy the full SHA
    9495095 View commit details
    Browse the repository at this point in the history
  4. Fix linkage for large binaries on mips64 platforms ...

    ... by enabling xgot feature
    
    Co-Authored-By: Zixing Liu <[email protected]>
    2 people authored and liushuyu committed May 29, 2023
    Configuration menu
    Copy the full SHA
    b65c2af View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Add --warnings warn flag to x.py

    So that bootstrap itself can be built with warnings not being treated as errors.
    Kobzol committed May 30, 2023
    Configuration menu
    Copy the full SHA
    023e6c4 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Rollup merge of rust-lang#111318 - scottmcm:operand-value-poison, r=c…

    …ompiler-errors
    
    Add a distinct `OperandValue::ZeroSized` variant for ZSTs
    
    These tend to have special handling in a bunch of places anyway, so the variant helps remember that.  And I think it's easier to grok than `Aggregate`s sometimes being `Immediates` (after all, I previously got that wrong and caused rust-lang#109992).  As a minor bonus, it means we don't need to generate poison LLVM values for ZSTs to pass around in `OperandValue::Immediate`s.
    
    Inspired by rust-lang#110021 (comment), so
    r? ```@compiler-errors```
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    6990b85 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#111677 - fee1-dead-contrib:rustc_const_eval…

    …-translatable, r=oli-obk,RalfJung
    
    Use translatable diagnostics in `rustc_const_eval`
    
    This PR:
    
    * adds a `no_span` parameter to `note` / `help` attributes when using `Subdiagnostic` to allow adding notes/helps without using a span
    * has minor tweaks and changes to error messages
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    20e2e81 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#111772 - liushuyu:ubuntu/mips64-linkage, r=…

    …jackh726
    
    Fix linkage for large binaries on mips64 platforms
    
    This pull request fixes the linkage for large binaries on mips64 platforms by enabling the `xgot` feature in LLVM.
    
    It is well understood that the generated binary will gain a hefty performance penalty where the external symbol jumps now cost at least three instructions each.
    
    Also, this pull request does not address the same issue on the mips32 counterparts (due to being unable to test the changes thoroughly).
    
    Should fix rust-lang#52108
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    ea161bb View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#111975 - jyn514:normalization, r=cjgillot

    Stop normalizing so many different prefixes
    
    Previously, we would normalize *all* of
    - the absolute path to the repository checkout
    - the /rustc/$sha for stage1 (if `remap-debuginfo` was enabled)
    - the /rustc/$sha for download-rustc
    - the sysroot for download-rustc
    
    Now, we consistently only normalize /rustc/FAKE_PREFIX. Not only is this much simpler, but it also avoids ongoing maintenance for download-rustc and makes it much less likely that tests break by accident.
    
    - Change `tests/ui/track-diagnostics/track6.rs` to use a relative path instead of an absolute one. I am not actually sure why `track_caller` works here, but it does seem to work 🤷
    
    - Pass `-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX` to all suites, not just UI. In particular, mir-opt tests emit /rustc/ paths in their output.
    
    r? `@cjgillot` since you reviewed rust-lang#110699 - this is the test that it doesn't regress :)
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    c53067d View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#111979 - jyn514:cargoflags, r=albertlarsan68

    Respect CARGOFLAGS in bootstrap.py
    
    This makes it possible to pass flags to bootstrap itself, for consistency with std/rustc: https://github.com/rust-lang/rust/blob/04265621f9a82cfc2fc2278b935dcc5d4a1c39b7/src/bootstrap/builder.rs#L1446-L1447
    Like RUSTFLAGS, this doesn't support CARGOFLAGS_BOOTSTRAP: https://github.com/rust-lang/rust/blob/6674dcda7a1da4c66e0aa0cfc67b27e42f4ebb34/src/bootstrap/bootstrap.py#L883-L884
    
    I found this useful recently when I wanted to pass `-Zsparse-registry` to an old checkout of the compiler from before it was stabilized in cargo.
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    ead9d0c View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#112089 - Kobzol:bootstrap-warnings, r=jyn514

    Add `--warnings warn` flag to `x.py`
    
    So that bootstrap itself can be built with warnings not being treated as errors.
    
    Fixes: rust-lang#76805
    
    r? `@jyn514`
    matthiaskrgr authored May 31, 2023
    Configuration menu
    Copy the full SHA
    08407dc View commit details
    Browse the repository at this point in the history