Skip to content

Add Alias to smir #113943

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

Jump to bottom
Merged
merged 2 commits into from
Jul 23, 2023
Merged

Add Alias to smir #113943

merged 2 commits into from
Jul 23, 2023

Conversation

ericmarkmartin
Copy link
Contributor

@ericmarkmartin ericmarkmartin commented Jul 22, 2023 •
edited
Loading

r? Spastorino

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

r? @compiler-errors

(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 Jul 22, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

Could not assign reviewer from: Spastorino.
User(s) Spastorino are either the PR author or are already assigned, and there are no other candidates.
Use r? to specify someone else to assign.

@ericmarkmartin ericmarkmartin force-pushed the smir-ty-alias branch 2 times, most recently from e038a38 to f5bf617 Compare July 22, 2023 02:06
@rust-log-analyzer

This comment has been minimized.

# to view
@ericmarkmartin ericmarkmartin force-pushed the smir-ty-alias branch 3 times, most recently from 0a96e64 to 0cebc5b Compare July 22, 2023 04:27
@oli-obk
Copy link
Contributor

oli-obk commented Jul 22, 2023

r? @spastorino

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

Could not assign reviewer from: spastorino.
User(s) spastorino are either the PR author or are already assigned, and there are no other candidates.
Use r? to specify someone else to assign.

spastorino
spastorino reviewed Jul 22, 2023
View reviewed changes
compiler/rustc_smir/src/stable_mir/ty.rs Outdated
@@ -17,6 +17,7 @@ type Span = Opaque;
#[derive(Clone, Debug)]
pub enum TyKind {
RigidTy(RigidTy),
Alias(AliasDef, GenericArgs, AliasKind),
Copy link
Member

Choose a reason for hiding this comment

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

I'd make this match more closely what we have in rustc_middle. So Alias(AliasKind, AliasTy) and AliasTy has the AliasDef and GenericArgs. No big reasons for this, it's just to follow the pattern we have for other variants.

@spastorino
Copy link
Member

Looks perfect now.
Last request, can you squash commits?. Maybe you can add a commit with the new documentation of Inherited and the other one with the rest.

@ericmarkmartin ericmarkmartin changed the title Add type conversion for Alias Add Alias to smir Jul 22, 2023
@spastorino
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 22, 2023

📌 Commit 7ac0ef9 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 Jul 22, 2023
@bors
Copy link
Collaborator

bors commented Jul 22, 2023

⌛ Testing commit 7ac0ef9 with merge 98179ad...

@bors
Copy link
Collaborator

bors commented Jul 23, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2023
@bors bors merged commit 98179ad into rust-lang:master Jul 23, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 23, 2023
This was referenced Jul 23, 2023
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (98179ad): 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)		 2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
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: 651.728s -> 651.172s (-0.09%)

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

Successfully merging this pull request may close these issues.
8 participants
@ericmarkmartin @rustbot @rust-log-analyzer @oli-obk @spastorino @bors @rust-timer @compiler-errors