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

Fix sized check ICE in asm check #99124

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Fix sized check ICE in asm check #99124

merged 1 commit into from
Jul 12, 2022

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jul 10, 2022 •
edited
Loading

Fixes (beta nominated, so doesn't close) #99122

  1. Moves a check for unresolved inference variables to before other checks that could possibly ICE. We're not changing behavior here, just doing the same thing earlier in the function.
  2. Erases region variables in sized check (which are not resolved at this point) because rustc will also ICE when region vars are passed to a query which does not canonicalize them.

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

r? @oli-obk

(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 Jul 10, 2022
@compiler-errors compiler-errors mentioned this pull request Jul 10, 2022
Closed
@oli-obk oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 11, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jul 11, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jul 11, 2022

📌 Commit 3ac69d7 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 Jul 11, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jul 11, 2022
@Dylan-DPC
Rollup merge of rust-lang#99124 - compiler-errors:issue-99122, r=oli-obk
db4e980 
Fix sized check ICE in asm check

Fixes (beta nominated, so doesn't close) rust-lang#99122
@Dylan-DPC Dylan-DPC mentioned this pull request Jul 11, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 11, 2022
@matthiaskrgr
Rollup merge of rust-lang#99124 - compiler-errors:issue-99122, r=oli-obk
0b6ed7b 
Fix sized check ICE in asm check

Fixes (beta nominated, so doesn't close) rust-lang#99122
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r- failed in a rollup
#99159 (comment)

@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 Jul 11, 2022
@compiler-errors
Copy link
Member Author

oops, should restrict these tests to the right platform.

@rustbot
Copy link
Collaborator

rustbot commented Jul 11, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@compiler-errors
Copy link
Member Author

Some changes occurred in src/tools/cargo

Sorry, accidentally pushed some updated git submodules. They are no longer there.

@compiler-errors
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jul 11, 2022

📌 Commit 5c6560f 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 Jul 11, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2022
@bors
Auto merge of rust-lang#99165 - matthiaskrgr:rollup-rqpelfa, r=matthi…
b3f4c31 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#97210 (Support `-A`, `-W`, `-D` and `-F` when running `./x.py clippy`)
 - rust-lang#99055 (Fix rustdoc help options)
 - rust-lang#99075 (Fix duplicated type annotation suggestion)
 - rust-lang#99124 (Fix sized check ICE in asm check)
 - rust-lang#99142 (fix(doctest): treat fatal parse errors as incomplete attributes)
 - rust-lang#99145 (Don't rerun the build script for the compiler each time on non-windows platforms)
 - rust-lang#99146 (Do not error during method probe on `Sized` predicates for types that aren't the method receiver)
 - rust-lang#99161 (compiletest: trim edition before passing as flag)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7151aaf into rust-lang:master Jul 12, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 12, 2022
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 14, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 15, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Jul 15, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 15, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2022
@bors
Auto merge of rust-lang#99300 - Mark-Simulacrum:beta-next, r=Mark-Sim…
efd3583 
…ulacrum

[beta] rollup

*  Fix sized check ICE in asm check rust-lang#99124
*  Windows: Fallback for overlapped I/O rust-lang#98950
*  promote placeholder bounds to 'static obligations rust-lang#98713
*  Create fresh lifetime parameters for bare fn trait too rust-lang#98637

r? `@Mark-Simulacrum`
@jruderman jruderman mentioned this pull request Nov 16, 2022
Closed
@compiler-errors compiler-errors deleted the issue-99122 branch August 11, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.63.0
Development

Successfully merging this pull request may close these issues.
8 participants
@compiler-errors @rust-highfive @oli-obk @bors @matthiaskrgr @rustbot @apiraino @Mark-Simulacrum