Skip to content

Rollup of 6 pull requests #118723

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 15 commits into from
Dec 8, 2023
Merged

Rollup of 6 pull requests #118723

merged 15 commits into from
Dec 8, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bvanjoi and others added 15 commits November 15, 2023 15:28
Co-authored-by: Michael Goulet <michael@errs.io>
These files were added to the repository but never wired up so they could
be used - and that was a few years ago without anyone noticing - so let's
remove these, they can be re-added if someone wants them.

Signed-off-by: David Wood <david@davidtw.co>
Adds char to CFI integer normalization to conform to rust-lang#118032 for
cross-language CFI support.
discard invalid spans in external blocks

Fixes rust-lang#116203

This PR has discarded the invalid `const_span`, thereby making the format more neat.

r? ``@Nilstrieb``
Only check principal trait ref for object safety

It should make things a bit faster, in case we end up registering a bunch of object safety preds.

r? ```@ghost```
…r-errors

Add method to get type of an Rvalue in StableMIR

Provide a method to StableMIR users to retrieve the type of an Rvalue operation. There were two possible implementation:

1. Create the logic inside stable_mir to process the type according to the Rvalue semantics, which duplicates the logic of `rustc_middle::mir::Rvalue::ty()`.
2. Implement the Rvalue translation from StableMIR back to internal representation, invoke the `rustc_middle::mir::Rvalue::ty()`, and translate the return value to StableMIR.

I chose the first one for now since the duplication was fairly small, and the option 2 would require way more work to translate everything back to rustc internal representation. If we eventually add those translations, we could easily swap to the option 2.

```@compiler-errors``` / ```@ouz-a``` Please let me know if you have any strong opinion here.

r? ```@compiler-errors```
Ping GuillaumeGomez for changes in rustc_codegen_gcc

Since I work on it and also added its testsuite into rustc's CI, I'd like to know if there are changes.
…, r=compiler-errors

targets: remove not-added {i386,i486}-unknown-linux-gnu

These files were added to the repository but never wired up so they could be used - and that was a few years ago without anyone noticing - so let's remove these, they can be re-added if someone wants them.

cc rust-lang#80662
r? ```@pnkfelix``` (familiar with the tier policy and Wesley is on vacation)
…s-118032, r=compiler-errors

CFI: Add char to CFI integer normalization

Adds char to CFI integer normalization to conform to rust-lang#118032 for cross-language CFI support.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Dec 7, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Dec 7, 2023

📌 Commit 71812d7 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 Dec 7, 2023
@bors
Copy link
Collaborator

bors commented Dec 7, 2023

⌛ Testing commit 71812d7 with merge 370c911...

@bors
Copy link
Collaborator

bors commented Dec 8, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 8, 2023
@bors bors merged commit 370c911 into rust-lang:master Dec 8, 2023
@rustbot rustbot added this to the 1.76.0 milestone Dec 8, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116420 discard invalid spans in external blocks dfa67a6e9cd36a146679c494ef1c36881e7c1c58 (link)
#118686 Only check principal trait ref for object safety 07f9736d010e1934bf98ad749b0db9c18aed67b6 (link)
#118688 Add method to get type of an Rvalue in StableMIR 247b62333813653637dc4ff4a7a94462c2ecca88 (link)
#118707 Ping GuillaumeGomez for changes in rustc_codegen_gcc 3988fcc0f656577fa36918439a6151a324912fd2 (link)
#118712 targets: remove not-added {i386,i486}-unknown-linux-gnu 1dc75ca5c9fb9a04d6a31d1f91ee7adb9a23d977 (link)
#118719 CFI: Add char to CFI integer normalization 7534c1aa5ef1970fbff731dd855dec80ae9c25b3 (link)

previous master: 503e129328

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (370c911): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.5% [0.5%, 4.1%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.5% [-2.4%, -0.6%] 2
Improvements ✅
(secondary)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) 1.2% [-2.4%, 4.1%] 6

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

Binary size

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

Bootstrap: 675.646s -> 673.459s (-0.32%)
Artifact size: 313.94 MiB -> 314.00 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-409e9u1 branch March 16, 2024 18:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants