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 in opt_suggest_box_span #101604

Merged
merged 2 commits into from
Sep 12, 2022
Merged

Conversation

compiler-errors
Copy link
Member

We were totally mishandling substs and obligations in opt_suggest_box_span, so I reworked that function pretty heavily.

Also some drive-by changes, namely removing ret_type_span.

Fixes #101465

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 9, 2022
@rust-highfive
Copy link
Collaborator

r? @lcnr

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2022
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

one nit, then r=me

compiler/rustc_typeck/src/check/_match.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/_match.rs Show resolved Hide resolved
compiler/rustc_typeck/src/check/_match.rs Show resolved Hide resolved
@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 12, 2022
@bors
Copy link
Contributor

bors commented Sep 12, 2022

⌛ Trying commit 5599a45 with merge 3e9e52a97e7a94c5be229f2f1bdc5582aa3123f4...

@bors
Copy link
Contributor

bors commented Sep 12, 2022

☀️ Try build successful - checks-actions
Build commit: 3e9e52a97e7a94c5be229f2f1bdc5582aa3123f4 (3e9e52a97e7a94c5be229f2f1bdc5582aa3123f4)

@rust-timer
Copy link
Collaborator

Queued 3e9e52a97e7a94c5be229f2f1bdc5582aa3123f4 with parent 98e1f04, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3e9e52a97e7a94c5be229f2f1bdc5582aa3123f4): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) - - 0

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.

mean1 range count2
Regressions ❌
(primary)
4.6% [3.7%, 5.5%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.4% [-3.6%, -3.2%] 2
Improvements ✅
(secondary)
-1.5% [-2.3%, -0.6%] 2
All ❌✅ (primary) 0.6% [-3.6%, 5.5%] 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.

mean1 range count2
Regressions ❌
(primary)
2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)
4.8% [4.8%, 4.8%] 1
Improvements ✅
(primary)
-3.9% [-5.3%, -2.3%] 4
Improvements ✅
(secondary)
-3.6% [-3.9%, -3.4%] 2
All ❌✅ (primary) -2.6% [-5.3%, 2.4%] 5

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 12, 2022
@lcnr
Copy link
Contributor

lcnr commented Sep 12, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Sep 12, 2022

📌 Commit 5599a45 has been approved by lcnr

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 Sep 12, 2022
@bors
Copy link
Contributor

bors commented Sep 12, 2022

⌛ Testing commit 5599a45 with merge a93214e...

@bors
Copy link
Contributor

bors commented Sep 12, 2022

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing a93214e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 12, 2022
@bors bors merged commit a93214e into rust-lang:master Sep 12, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 12, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a93214e): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.2% [-5.2%, -5.2%] 1
All ❌✅ (primary) - - 0

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.9% [1.4%, 2.3%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) - - 0

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.

mean1 range count2
Regressions ❌
(primary)
2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.6% [-3.4%, 2.2%] 2

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@compiler-errors compiler-errors deleted the issue-101465 branch November 2, 2022 02:58
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.

type parameter out of range when substituting
7 participants