Skip to content

Return a FxIndexSet in is_late_bound query. #99219

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

Return a FxIndexSet in is_late_bound query. #99219

wants to merge 4 commits into from

Conversation

cjgillot
Copy link
Contributor

Fixes #98890
r? @cuviper

cjgillot and others added 3 commits July 13, 2022 22:19
@cjgillot
Return a FxIndexSet in is_late_bound query.
e8fe56e 
This return value is iterated upon by borrowck, hence the need to preserve
a deterministic iteration order.
@cjgillot
Add regression test.
f14df05
@michaelwoerister @cjgillot
Add link to issue for src/test/incremental/async-lifetimes.rs
35a0c60
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 13, 2022
@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 13, 2022
cuviper
cuviper reviewed Jul 13, 2022
View reviewed changes
@cuviper
Copy link
Member

cuviper commented Jul 13, 2022

@rust-lang/compiler, this is a stable 1.62.0 backport of #98959 to fix #98890.

@rustbot label +stable-nominated

@rustbot rustbot added the stable-nominated Nominated for backporting to the compiler in the stable channel. label Jul 13, 2022
@rust-log-analyzer

This comment has been minimized.

# to view
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
  CACHE_DOMAIN: ci-caches.rust-lang.org
  IMAGE: x86_64-gnu-llvm-12
##[endgroup]
fatal: unknown commit origin/beta
fatal: unknown commit origin/master
All commits in `HEAD` are present in `beta`
All commits in `HEAD` are present in `master`
src/ci/scripts/verify-stable-version-number.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: x86_64-gnu-llvm-12

@apiraino
Copy link
Contributor

Visiting during T-compiler meeting.

Stable backport decision delayed waiting for this comment to be addressed. T-team discussion on Zulip

wesleywiser
wesleywiser approved these changes Jul 15, 2022
View reviewed changes
compiler/rustc_resolve/src/late/lifetimes.rs
@@ -482,6 +482,11 @@ fn convert_named_region_map(tcx: TyCtxt<'_>, named_region_map: NamedRegionMap) -
let def_id = tcx.hir().local_def_id(hir_id);
map.insert(def_id);
}
for (_, late_bound) in &mut rl.late_bound {
late_bound.sort_by(|&a, &b| {
Copy link
Member

@wesleywiser wesleywiser Jul 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

nit: I think it would be good to leave a comment here explaining why we're doing this sort but that doesn't need to block a merge

cuviper
cuviper approved these changes Jul 15, 2022
View reviewed changes
Copy link
Member

@cuviper cuviper left a comment

Choose a reason for hiding this comment

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

r+, but we'll add it to a stable release PR rather than merging it here.

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 15, 2022
Merged
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 15, 2022 •
edited
Loading

Closing since this was bundled into #99299.

@cuviper cuviper added this to the 1.62.1 milestone Jul 15, 2022
@cuviper cuviper added stable-accepted Accepted for backporting to the compiler in the stable channel. and removed stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jul 15, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2022
@bors
Auto merge of rust-lang#99299 - Mark-Simulacrum:stable-next, r=Mark-S…
e092d0b 
…imulacrum

[stable] 1.62.1 release

This bundles:

*  Windows: Fallback for overlapped I/O rust-lang#98950
*  don't succeed evaluate_obligation query if new opaque types were registered rust-lang#98614
*  Mitigate MMIO stale data vulnerability rust-lang#98126
*  Return a FxIndexSet in is_late_bound query. rust-lang#99219

Also bumps the version number to 1.62.1 and includes a short release notes section for the release.

r? `@Mark-Simulacrum`
@cjgillot cjgillot deleted the late-bound-order-stable branch July 18, 2022 20:28
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@cuviper cuviper cuviper approved these changes

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@cuviper cuviper

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. stable-accepted Accepted for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.62.1
Development

Successfully merging this pull request may close these issues.
9 participants
@cjgillot @rust-highfive @cuviper @rust-log-analyzer @apiraino @Mark-Simulacrum @wesleywiser @rustbot @michaelwoerister