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 7 pull requests #127197

Merged
merged 15 commits into from
Jul 1, 2024
Merged

Rollup of 7 pull requests #127197

merged 15 commits into from
Jul 1, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

workingjubilee and others added 15 commits June 24, 2024 16:54
Otherwise the types might not match

Fixes 127089
…piler_builtins`

Formerly the `loongarch*-*-none*` targets were added to the
`dist-various-2` CI job, but no corresponding toolchain was added along
with them. This meant the `compiler_builtins` for the targets were built
with the host toolchain.

As the other `dist-various` toolchains are mostly pre-built so far, to
avoid burdening them with crosstool-ng builds, simply move the two
bare-metal LoongArch targets to the `dist-loongarch64-linux` job which
has a ready-to-use LoongArch toolchain. With the proper CFLAGS applied
it is possible to build artifacts suitable for bare-metal. I verified
that the `compiler_builtins` objects are now correctly produced
regarding architecture and ABI, with the changes here applied.

Fixes rust-lang#125908.

cc @heiher

try-job: dist-loongarch64-linux
try-job: dist-various-2
…r-simd-invalid-bitcast, r=calebzulawski

test: dont optimize to invalid bitcasts

Regression tests to prevent regressing.
Reduce merge conflicts from rustfmt's wrapping

Imports in this file are changed by many different features. Rustfmt insists on reformatting and rewrapping the imports every time they change, which causes chronic merge conflicts.

I've split the big import into multiple smaller ones, so that different features will conflict less often.
Only update `Eq` operands in GVN if it can update both sides

Otherwise the types might not match

Fixes rust-lang#127089

r? mir-opt
Fix x86_64 code being produced for bare-metal LoongArch targets' `compiler_builtins`

Formerly the `loongarch*-*-none*` targets were added to the `dist-various-2` CI job, but no corresponding toolchain was added along with them. This meant the `compiler_builtins` for the targets were built with the host toolchain.

As the other `dist-various` toolchains are mostly pre-built so far, to avoid burdening them with crosstool-ng builds, simply move the two bare-metal LoongArch targets to the `dist-loongarch64-linux` job which has a ready-to-use LoongArch toolchain. With the proper CFLAGS applied it is possible to build artifacts suitable for bare-metal. I verified that the `compiler_builtins` objects are now correctly produced regarding architecture and ABI, with the changes here applied.

Fixes rust-lang#125908.

cc ``@heiher``

try-job: dist-loongarch64-linux
try-job: dist-various-2
…er-errors

Introduce a `rustc_` attribute to dump all the `DefId` parents of a `DefId`

We've run into a bunch of issues with anon consts having the wrong generics and it would have been incredibly helpful to be able to quickly slap a `rustc_` attribute to check what `tcx.parent(` will return on the relevant DefIds.

I wasn't sure of a better way to make this work for anon consts than requiring the attribute to be on the enclosing item and then walking the inside of it to look for any anon consts. This particular method will honestly break at some point when we stop having a `DefId` available for anon consts in hir but that's for another day...

r? ``@compiler-errors``
Fix error in documentation for IpAddr::to_canonical and Ipv6Addr::to_canonical
…ro-calls, r=compiler-errors

Ensure `out_of_scope_macro_calls` lint is registered

Fixes part of rust-lang#126984 (comment).
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jul 1, 2024

📌 Commit f5ef1cd has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 1, 2024
@bors
Copy link
Contributor

bors commented Jul 1, 2024

⌛ Testing commit f5ef1cd with merge c3774be...

@bors
Copy link
Contributor

bors commented Jul 1, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing c3774be to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 1, 2024
@bors bors merged commit c3774be into rust-lang:master Jul 1, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 1, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126923 test: dont optimize to invalid bitcasts 90ff8450d693528c974a2c5d393616cdb75f1f2d (link)
#127090 Reduce merge conflicts from rustfmt's wrapping 6b46a6c2be25b6a2e99abf9171d9bec37a425f4c (link)
#127105 Only update Eq operands in GVN if it can update both sides 79926b3660843ac3b1731e8276015ba47a4b5fb5 (link)
#127150 Fix x86_64 code being produced for bare-metal LoongArch tar… f3b8ff8afcee33abbe9df82c76c9678c7385cc9e (link)
#127181 Introduce a rustc_ attribute to dump all the DefId pare… 4398731f8c9093abc864823d1de7cf325b5e7045 (link)
#127182 Fix error in documentation for IpAddr::to_canonical and Ipv… dda2f5aad0fdcd7ea8acb0ba664411cab3f42f0a (link)
#127191 Ensure out_of_scope_macro_calls lint is registered 5507ce77854bd827329c994e5896ae1911824426 (link)

previous master: 7b21c18fe4

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Jul 1, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c3774be): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 699.484s -> 697.337s (-0.31%)
Artifact size: 326.66 MiB -> 326.67 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-aqpvn5q branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.