Skip to content

Rollup of 5 pull requests #128707

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 12 commits into from
Aug 6, 2024
Merged

Rollup of 5 pull requests #128707

merged 12 commits into from
Aug 6, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 12 commits August 2, 2024 23:24
…-Simulacrum

Promote riscv64gc-unknown-linux-musl to tier 2
Use `ParamEnv::reveal_all` in CFI

I left a huge comment for why this ICEs in the test I committed.

`typeid_for_instance` should only be called on monomorphic instances during codegen, and we should just be using `ParamEnv::reveal_all()` rather than the param-env of the instance itself. I added an assertion to ensure that we only do this for fully substituted instances (this may break with polymorphization, but I kinda don't care lol).

Fixes rust-lang#114160
cc `@rcvalle`
…compiler-errors

custom MIR: add support for tail calls

Cc ``@WaffleLapkin``
Normalize when equating `dyn` tails in MIR borrowck

See the explanation in the comment.

Fixes rust-lang#128621
cc `@WaffleLapkin`
…rors

interpret: move nullary-op evaluation into operator.rs

We call it an operator, so we might as well treat it like one. :)

Also use more consistent naming for the "evaluate intrinsic" functions. "emulate" is really the wrong term, this *is* a genuine implementation of the intrinsic semantics after all.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations 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 Aug 5, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 5, 2024

📌 Commit c53698b 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 Aug 5, 2024
@bors
Copy link
Collaborator

bors commented Aug 5, 2024

⌛ Testing commit c53698b with merge b586701...

@bors
Copy link
Collaborator

bors commented Aug 6, 2024

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#122049 Promote riscv64gc-unknown-linux-musl to tier 2 094cf4322fbb0f43ec7c854f5b2f9752d53fcf79 (link)
#128580 Use ParamEnv::reveal_all in CFI d85969256198c24d3bb1401faf3e38e64ad0245d (link)
#128688 custom MIR: add support for tail calls 0cd1477c8c0e21c504df5b307e90f1e8b1125d74 (link)
#128694 Normalize when equating dyn tails in MIR borrowck aeaa236726f7ac1e868b0701de273471e37291c3 (link)
#128697 interpret: move nullary-op evaluation into operator.rs b53ce2ee9ade473cce1a9f0ebb6d4bf96545861c (link)

previous master: e57f3090ae

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 (b586701): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.4% [-0.5%, -0.4%] 6
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 8.2%, secondary -2.7%)

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)
8.2% [8.2%, 8.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-3.5%, -2.0%] 2
All ❌✅ (primary) 8.2% [8.2%, 8.2%] 1

Cycles

Results (secondary 6.6%)

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
Regressions ❌
(secondary)
6.6% [6.6%, 6.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 760.451s -> 761.437s (0.13%)
Artifact size: 336.85 MiB -> 336.80 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-63klywk branch September 1, 2024 17:35
# for free to join this conversation on GitHub. Already have an account? # 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. PG-exploit-mitigations Project group: Exploit mitigations 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.

7 participants