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.

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

Fix ICE ProjectionKinds Deref and Field were mismatched #118584

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

gurry
Copy link
Contributor

@gurry gurry commented Dec 4, 2023

Fix #118144

Removed the check that ICEd if the sequence of projection kinds were different across captures. Instead we now sort based only on Field projection kinds.

@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2023

r? @WaffleLapkin

(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 Dec 4, 2023
@gurry
Copy link
Contributor Author

gurry commented Dec 4, 2023

Also cc @wesleywiser since they opened the original PR #89208

@gurry
Copy link
Contributor Author

gurry commented Dec 17, 2023

@WaffleLapkin please review

Copy link
Member

@WaffleLapkin WaffleLapkin left a comment

Choose a reason for hiding this comment

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

r=me after fixing nit picks

@WaffleLapkin
Copy link
Member

@bors delegate+
@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2023
@bors
Copy link
Contributor

bors commented Dec 17, 2023

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

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

@WaffleLapkin
Copy link
Member

btw @wesleywiser please take a look anyway, in case I've missed something

@gurry gurry force-pushed the 118144-projection-kind-mismatched branch from 4fb887d to c3a739e Compare December 18, 2023 11:28
@gurry
Copy link
Contributor Author

gurry commented Dec 18, 2023

@bors r=@WaffleLapkin

@bors
Copy link
Contributor

bors commented Dec 18, 2023

📌 Commit c3a739e has been approved by WaffleLapkin

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 Dec 18, 2023
@bors
Copy link
Contributor

bors commented Dec 18, 2023

⌛ Testing commit c3a739e with merge a7690a3...

@bors
Copy link
Contributor

bors commented Dec 18, 2023

☀️ Test successful - checks-actions
Approved by: WaffleLapkin
Pushing a7690a3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 18, 2023
@bors bors merged commit a7690a3 into rust-lang:master Dec 18, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 18, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a7690a3): 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.1% [0.6%, 2.1%] 3
Regressions ❌
(secondary)
1.3% [1.3%, 1.3%] 1
Improvements ✅
(primary)
-3.7% [-3.7%, -3.7%] 1
Improvements ✅
(secondary)
-1.3% [-1.3%, -1.3%] 1
All ❌✅ (primary) -0.1% [-3.7%, 2.1%] 4

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.8% [0.8%, 0.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
-1.9% [-2.1%, -1.5%] 6
All ❌✅ (primary) 0.1% [-0.6%, 0.8%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 673.754s -> 673.256s (-0.07%)
Artifact size: 312.47 MiB -> 312.47 MiB (-0.00%)

@gurry gurry deleted the 118144-projection-kind-mismatched branch December 19, 2023 03:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

ice: ProjectionKinds Deref and Field were mismatched
5 participants