Skip to content

Rollup of 6 pull requests #115354

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 18 commits into from
Aug 29, 2023
Merged

Rollup of 6 pull requests #115354

merged 18 commits into from
Aug 29, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cuishuang and others added 18 commits August 17, 2023 15:10
Signed-off-by: cui fliter <imcusg@gmail.com>
Signed-off-by: David Wood <david@davidtw.co>
Don't ICE on layout computation failure

Fixes rust-lang#111176 regression.

r? `@oli-obk`
…list-67992, r=wesleywiser

tests: add test for rust-lang#67992

Fixes rust-lang#67992.

Just adding a regression test for this issue.
Add new interface to smir

Removes the boiler plate from `crate-info.rs`, and creates new interface for the smir.

Addressing rust-lang/project-stable-mir#23

r? `@spastorino`
Tweaks and improvements on SMIR around generics_of and predicates_of

r? `@oli-obk`

This allows an API like the following ...

```rust
    let trait_decls = stable_mir::all_trait_decls().iter().map(|trait_def| {
        let trait_decl = stable_mir::trait_decl(trait_def);
        let generics = trait_decl.generics_of();
        let predicates = trait_decl.predicates_of().predicates;
```

I didn't like that much `trait_def.trait_decl()` which is it possible but adding a method to a def_id that loads up a whole trait definition looks backwards to me.
some more is_zst that should be is_1zst

Follow-up to rust-lang#115277
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@matthiaskrgr
Copy link
Member Author

@bors ping

@bors
Copy link
Collaborator

bors commented Aug 29, 2023

📌 Commit a644f37 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 29, 2023
@rustbot rustbot added 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 Aug 29, 2023
@bors
Copy link
Collaborator

bors commented Aug 29, 2023

😪 I'm awake I'm awake

@bors
Copy link
Collaborator

bors commented Aug 29, 2023

⌛ Testing commit a644f37 with merge 83995f3...

@bors
Copy link
Collaborator

bors commented Aug 29, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 29, 2023
@bors bors merged commit 83995f3 into rust-lang:master Aug 29, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 29, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#111580 Don't ICE on layout computation failure bd740658ef45d9a7b24903677d144ae1f6d5c07f (link)
#114923 doc: update lld-flavor ref 7b94bc5aa2fd1dbbaf279f782b25e1b3781e8010 (link)
#115174 tests: add test for #67992 100ec01a7b6f58e5f7835d326606f28585f6b5f6 (link)
#115187 Add new interface to smir cc6b65e23505c85f0289d77232c52ab7e487cd0f (link)
#115300 Tweaks and improvements on SMIR around generics_of and pred… 32766206b913ccb2f719dba71715ab4f91710cff (link)
#115340 some more is_zst that should be is_1zst 7d8b6650396323e15c98d80f8b3e0c45c75350b5 (link)

previous master: b2515fa741

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 Aug 29, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (83995f3): 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)

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

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
Regressions ❌
(secondary)
2.0% [2.0%, 2.0%] 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: 631.565s -> 630.72s (-0.13%)
Artifact size: 315.99 MiB -> 316.01 MiB (0.01%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants