Skip to content

Remove fold code and add Const::internal() to StableMIR - #117113

Merged
bors merged 2 commits into
rust-lang:masterfrom
celinval:smir-stable-ty
Oct 25, 2023
Merged

Remove fold code and add Const::internal() to StableMIR#117113
bors merged 2 commits into
rust-lang:masterfrom
celinval:smir-stable-ty

Conversation

@celinval

@celinval celinval commented Oct 24, 2023

Copy link
Copy Markdown
Contributor

We are not planning to support user generated constant in the foreseeable future, so we are cleaning up the fold logic and user created type for now. Users should use Instance::resolve in order to trigger monomorphization.

The Instance::resolve was however incomplete, since we weren't handling internalizing constants yet. Thus, I added that.

I decided to keep the Const fields private in case we decide to translate them lazily.

@rustbot

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

r? @davidtwco

(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 Oct 24, 2023
@rustbot

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

@celinval

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Contributor Author

r? @oli-obk

@rustbot rustbot assigned oli-obk and unassigned davidtwco Oct 24, 2023
oli-obk
oli-obk reviewed Oct 24, 2023
View reviewed changes
Comment thread compiler/rustc_smir/src/rustc_smir/mod.rs Outdated
pub alloc_ids: IndexMap<AllocId, stable_mir::AllocId>,
pub spans: IndexMap<rustc_span::Span, Span>,
pub types: Vec<MaybeStable<TyKind, Ty<'tcx>>>,
pub types: Vec<Ty<'tcx>>,

ghost Oct 24, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This can now be an IndexMap, too

@oli-obk

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Contributor

@bors delegate+

r=me with types made an IndexMap

@bors

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

✌️ @celinval, you can now approve this pull request!

If @oli-obk told you to "r=me" after making some further change, please make that change, then do @bors r=@oli-obk

@celinval

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Contributor Author

@bors r=@oli-obk

@bors

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit cf6a04e has been approved by oli-obk

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 Oct 24, 2023
Celina G. Val
Remove fold code and add Const::internal()
3f60165 
We are not planning to support user generated constant in the
foreseeable future, so we are removing the Fold logic for now in
favor of the Instance::resolve logic.

The Instance::resolve was however incomplete, since we weren't handling
internalizing constants yet. Thus, I added that.

I decided to keep the Const fields private in case we decide to
translate them lazily.
@bors

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #117135) 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 Oct 24, 2023
@celinval

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Contributor Author

@bors r=@oli-obk

@bors

ghost commented Oct 24, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 17f6df9 has been approved by oli-obk

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 Oct 24, 2023
@bors

ghost commented Oct 25, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 17f6df9 with merge b66fe58...

@bors

ghost commented Oct 25, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing b66fe58 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2023
@bors
bors merged commit b66fe58 into rust-lang:master Oct 25, 2023
@rustbot rustbot added this to the 1.75.0 milestone Oct 25, 2023
@rust-timer

ghost commented Oct 25, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (b66fe58): 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.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)		 -3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) -0.6% [-0.6%, -0.6%] 1

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.3% [2.3%, 2.3%] 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: missing data
Artifact size: 304.40 MiB -> 304.42 MiB (0.01%)

@celinval celinval mentioned this pull request Oct 25, 2023
Closed
@github-actions github-actions Bot mentioned this pull request Oct 31, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

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

Development

Successfully merging this pull request may close these issues.

6 participants

@celinval @rustbot @oli-obk @bors @rust-timer @davidtwco