Skip to content

Rollup of 5 pull requests - #128707

Merged
bors merged 12 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-63klywk
Aug 6, 2024
Merged

Rollup of 5 pull requests#128707
bors merged 12 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-63klywk

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Aug 5, 2024

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errorsand others added 12 commits August 2, 2024 23:24
@compiler-errors
Use ParamEnv::reveal_all in CFI
b0beb64
@Amanieu
Promote riscv64gc-unknown-linux-musl to tier 2
de26ad1
@Amanieu
Make riscv64gc-unknown-linux-musl dynamically linked by default
a937a3b
@Amanieu
Add platform support document for riscv64gc-unknown-linux-musl
9963a6c
@RalfJung
custom MIR: add support for tail calls
212417b
@compiler-errors
Normalize when equating dyn tails in MIR borrowck
c6f8672
@RalfJung
interpret: move nullary-op evaluation into operator.rs
46896d6
@matthiaskrgr
Rollup merge ofrust-lang#122049- Amanieu:riscv64-musl-tier2, r=Mark…
8cbf1c1
…-Simulacrum
Promote riscv64gc-unknown-linux-musl to tier 2
@matthiaskrgr
Rollup merge ofrust-lang#128580- compiler-errors:cfi-param-env, r=lcnr
9cb3688
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).
Fixesrust-lang#114160
cc `@rcvalle`
@matthiaskrgr
Rollup merge ofrust-lang#128688- RalfJung:custom-mir-tail-calls, r=…
83155b3
…compiler-errors
custom MIR: add support for tail calls
Cc ``@WaffleLapkin``
@matthiaskrgr
Rollup merge ofrust-lang#128694- compiler-errors:norm, r=WaffleLapkin
77f57cb
Normalize when equating `dyn` tails in MIR borrowck
See the explanation in the comment.
Fixesrust-lang#128621
cc `@WaffleLapkin`
@matthiaskrgr
Rollup merge ofrust-lang#128697- RalfJung:nullary-op, r=compiler-er…
c53698b
…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.
@rustbotrustbot 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

matthiaskrgr commented Aug 5, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Aug 5, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c53698b has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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

bors commented Aug 5, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c53698b with merge b586701...

@bors

bors commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 6, 2024
@bors
bors merged commit b586701 into rust-lang:masterAug 6, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 6, 2024
@rust-timer

rust-timer commented Aug 6, 2024

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#122049Promote riscv64gc-unknown-linux-musl to tier 2094cf4322fbb0f43ec7c854f5b2f9752d53fcf79 (link)
#128580Use ParamEnv::reveal_all in CFId85969256198c24d3bb1401faf3e38e64ad0245d (link)
#128688custom MIR: add support for tail calls0cd1477c8c0e21c504df5b307e90f1e8b1125d74 (link)
#128694Normalize when equating dyn tails in MIR borrowckaeaa236726f7ac1e868b0701de273471e37291c3 (link)
#128697interpret: move nullary-op evaluation into operator.rsb53ce2ee9ade473cce1a9f0ebb6d4bf96545861c (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

@borsbors mentioned this pull request Aug 6, 2024
Merged
This was referenced Aug 6, 2024
Merged
Merged
@rust-timer

rust-timer commented Aug 6, 2024

Copy link
Copy Markdown
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.

meanrangecount
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.

meanrangecount
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.

meanrangecount
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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.PG-exploit-mitigationsProject group: Exploit mitigationsrollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

7 participants

@matthiaskrgr@bors@rust-timer@rustbot@compiler-errors@Amanieu@RalfJung