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

Iterate generics_def_id_map in reverse order to fix P-critical issue #100340

Merged
merged 3 commits into from
Aug 10, 2022
Merged

Iterate generics_def_id_map in reverse order to fix P-critical issue #100340

merged 3 commits into from
Aug 10, 2022

Conversation

spastorino
Copy link
Member

@spastorino spastorino commented Aug 9, 2022 •
edited
Loading

Closes #100187

Fixes a P-critical beta regression.

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

r? @cjgillot

(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 Aug 9, 2022
@spastorino spastorino added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 9, 2022
@compiler-errors
Copy link
Member

r? @compiler-errors
r=me once CI turns green

@spastorino
Copy link
Member Author

@bors r=compiler-errors p=10

@bors
Copy link
Contributor

bors commented Aug 9, 2022

📌 Commit 750a04e has been approved by compiler-errors

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 Aug 9, 2022
compiler-errors
compiler-errors reviewed Aug 9, 2022
View reviewed changes
compiler/rustc_ast_lowering/src/lib.rs
//
// for the opaque type generated on `impl Sized + 'b`, We want the result to be:
// impl_sized#'b, so iterating forward is the wrong thing to do.
for map in self.generics_def_id_map.iter().rev() {
Copy link
Member

Choose a reason for hiding this comment

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

It would be nice (in a separate fix) to avoid exposing this iter() altogether by wrapping this in an API called something like "StackMap" that does the iteration internally and only exposes a .get

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, was thinking about the same thing. Didn't want to complicate this PR so it's easier to review for beta backport.

@bors
Copy link
Contributor

bors commented Aug 9, 2022

⌛ Testing commit 750a04e with merge 4d7a7c7e368e82c236fabba1a65b30420cc3d2f3...

@bors
Copy link
Contributor

bors commented Aug 10, 2022

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 10, 2022
@compiler-errors
Copy link
Member

@bors retry test timeout

@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 Aug 10, 2022
@bors
Copy link
Contributor

bors commented Aug 10, 2022

⌛ Testing commit 750a04e with merge 8c93d28e444a7ee121a38f8ccff88a457dbb3710...

@compiler-errors
Copy link
Member

If this fails again then let's give precedence to rollups

@bors p=5

@rust-log-analyzer

This comment was marked as outdated.

Sign in to view
@bors
Copy link
Contributor

bors commented Aug 10, 2022

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 10, 2022
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 10, 2022
@compiler-errors
Copy link
Member

wtf

@bors retry failed to get 200 response from https://crates.io/api/v1/crates/tracing-tree/0.2.0/download, got 502

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  Downloaded vte v0.3.3
error: failed to download from `https://crates.io/api/v1/crates/tracing-tree/0.2.0/download`

Caused by:
  failed to get 200 response from `https://crates.io/api/v1/crates/tracing-tree/0.2.0/download`, got 502', src/tools/tidy/src/deps.rs:321:20
thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Any { .. }', src/tools/tidy/src/main.rs:66:9
##[error]Process completed with exit code 1.
Post job cleanup.
[command]/usr/local/bin/git version

@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 Aug 10, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 10, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2022
@bors
Auto merge of rust-lang#100356 - matthiaskrgr:rollup-he0vkjc, r=matth…
1603a70 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#99573 (Stabilize backtrace)
 - rust-lang#100069 (Add error if link_ordinal used with unsupported link kind)
 - rust-lang#100086 (Add more `// unit-test`s to MIR opt tests)
 - rust-lang#100332 (Rename integer log* methods to ilog*)
 - rust-lang#100334 (Suggest a missing semicolon before an array)
 - rust-lang#100340 (Iterate generics_def_id_map in reverse order to fix P-critical issue)
 - rust-lang#100345 (docs: remove repetition in `is_numeric` function docs)
 - rust-lang#100352 (Update cargo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 636f0c7 into rust-lang:master Aug 10, 2022
@bors
Copy link
Contributor

bors commented Aug 10, 2022

⌛ Testing commit 750a04e with merge 1603a70...

@rustbot rustbot added this to the 1.65.0 milestone Aug 10, 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 Aug 11, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 11, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.65.0, 1.64.0 Aug 11, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 11, 2022
Merged
@compiler-errors compiler-errors mentioned this pull request Aug 13, 2022
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 14, 2022
@bors
Auto merge of rust-lang#100412 - Mark-Simulacrum:beta-next, r=Mark-Si…
fb2194a 
…mulacrum

Rollup of beta backports

This rolls up bumping stage0 to released stable and:

* Iterate generics_def_id_map in reverse order to fix P-critical issue rust-lang#100340
*  [BETA 1.64] Only override published resolver when the workspace is different rust-lang/cargo#10970

r? `@Mark-Simulacrum`
@Noratrieb Noratrieb mentioned this pull request Oct 17, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@compiler-errors compiler-errors

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.64.0
Development

Successfully merging this pull request may close these issues.

ICE: Region parameter out of range when substituting in region 'b (index=4)
9 participants
@spastorino @rust-highfive @compiler-errors @bors @rust-log-analyzer @apiraino @cjgillot @Mark-Simulacrum @rustbot