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.

Sign up for GitHub

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

Jump to bottom

Add smir predicates_of #115084

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Add smir predicates_of #115084

merged 2 commits into from
Aug 25, 2023

Conversation

ericmarkmartin
Copy link
Contributor

@ericmarkmartin ericmarkmartin commented Aug 22, 2023 •
edited
Loading

@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2023

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Aug 22, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

@rustbot rustbot assigned spastorino and unassigned petrochenkov Aug 22, 2023
spastorino
spastorino reviewed Aug 22, 2023
View reviewed changes
compiler/rustc_smir/src/rustc_smir/mod.rs Outdated
parent: parent.map(|did| self.trait_def(did)),
predicates: predicates
.iter()
.map(|(clause, _span)| clause.as_predicate().kind().skip_binder().stable(self))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we already have spans around, as opaque probably.

@ericmarkmartin ericmarkmartin force-pushed the add-smir-cx-where-clauses branch from 49fc228 to c025bb2 Compare August 23, 2023 02:27
@spastorino
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 23, 2023

📌 Commit c025bb20f5c9148204d2812c8844acbe9e8ac0d0 has been approved by spastorino

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 23, 2023
@spastorino
Copy link
Member

@bors rollup- as it is going to clash with #115092

@bors
Copy link
Contributor

bors commented Aug 23, 2023

⌛ Testing commit c025bb20f5c9148204d2812c8844acbe9e8ac0d0 with merge cfc7c7a57a0f173d2797e7beb7f8da4e229aaf2c...

@bors
Copy link
Contributor

bors commented Aug 23, 2023

☀️ Test successful - checks-actions
Approved by: spastorino
Pushing cfc7c7a57a0f173d2797e7beb7f8da4e229aaf2c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2023
@bors
Copy link
Contributor

bors commented Aug 23, 2023

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cfc7c7a57a0f173d2797e7beb7f8da4e229aaf2c): 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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.4% [-3.1%, -1.8%] 2
All ❌✅ (primary) - - 0

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: 634.977s -> 634.549s (-0.07%)
Artifact size: 347.14 MiB -> 347.10 MiB (-0.01%)

@bors
Copy link
Contributor

bors commented Aug 23, 2023

☔ The latest upstream changes (presumably #115126) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 23, 2023
@spastorino spastorino force-pushed the add-smir-cx-where-clauses branch from c025bb2 to 20ca55b Compare August 23, 2023 13:45
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the add-smir-cx-where-clauses branch from 20ca55b to 107cb5c Compare August 23, 2023 14:47
@spastorino
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 23, 2023

📌 Commit 107cb5c has been approved by spastorino

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 23, 2023
@weihanglo weihanglo mentioned this pull request Aug 24, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2023
@bors
Auto merge of rust-lang#115193 - weihanglo:rollup-6s3mz06, r=weihanglo
c9228ae 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#114987 (elaborate a bit on the (lack of) safety in 'Mmap::map')
 - rust-lang#115084 (Add smir `predicates_of`)
 - rust-lang#115117 (Detect and report nix shell)
 - rust-lang#115124 (kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os`)
 - rust-lang#115152 (refactor(lint): translate `RenamedOrRemovedLint`)
 - rust-lang#115154 (Move some ui tests to subdirectories)
 - rust-lang#115167 (Fix ub-int-array test for big-endian platforms)
 - rust-lang#115172 (Add more tests for if_let_guard)
 - rust-lang#115177 (Add symbols for Clippy usage)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f846d7d into rust-lang:master Aug 25, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 25, 2023
@spastorino spastorino mentioned this pull request Aug 25, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2023
@bors
Auto merge of rust-lang#115211 - spastorino:add-missing-smir-generics…
c503527 
…-of, r=compiler-errors

Add missing high-level stable_mir::generics_of fn

We forgot to add this function in rust-lang#115092, as we have done on rust-lang#115084 and other high level APIs.

At some point I think we should re-organize the structure of the code but this is what we have for now.

r? `@compiler-errors`
Would have assigned `@oli-obk` but he is still on vacations
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Aug 26, 2023
@bors
Auto merge of #115211 - spastorino:add-missing-smir-generics-of, r=co…
cfa12f6 
…mpiler-errors

Add missing high-level stable_mir::generics_of fn

We forgot to add this function in rust-lang/rust#115092, as we have done on rust-lang/rust#115084 and other high level APIs.

At some point I think we should re-organize the structure of the code but this is what we have for now.

r? `@compiler-errors`
Would have assigned `@oli-obk` but he is still on vacations
@ericmarkmartin ericmarkmartin deleted the add-smir-cx-where-clauses branch September 2, 2023 02:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spastorino spastorino spastorino left review comments

Assignees

@spastorino spastorino

Labels
merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.
7 participants
@ericmarkmartin @rustbot @spastorino @bors @rust-timer @rust-log-analyzer @petrochenkov