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

Return a FxIndexSet in is_late_bound query. #98959

Merged
merged 3 commits into from
Jul 6, 2022

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jul 5, 2022

This return value is iterated upon by borrowck, hence the need to preserve
a deterministic iteration order.

Fixes #98890
Affects #96655

I don't know if this supersedes #98924 or fixes an unrelated bug.

r? @michaelwoerister
This may deserve a backport.

This return value is iterated upon by borrowck, hence the need to preserve
a deterministic iteration order.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 5, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 5, 2022
@michaelwoerister
Copy link
Member

Thanks, @cjgillot!

It might make #98924 obsolete, yes. I'm running a perf run there to see if it has any impact. If not, I we can merge that too.

Have you tried to write a regression test for this? #98890 gives a pretty good repro.

@michaelwoerister michaelwoerister added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 6, 2022
@michaelwoerister
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2022

📌 Commit 8ff4115 has been approved by michaelwoerister

@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 6, 2022
@wesleywiser
Copy link
Member

@bors rollup=never p=1

Fixes a P-critical issue; there might also be perf fallout.

@bors
Copy link
Contributor

bors commented Jul 6, 2022

⌛ Testing commit 8ff4115 with merge 3dcb616...

@bors
Copy link
Contributor

bors commented Jul 6, 2022

☀️ Test successful - checks-actions
Approved by: michaelwoerister
Pushing 3dcb616 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2022
@bors bors merged commit 3dcb616 into rust-lang:master Jul 6, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 6, 2022
@cjgillot cjgillot deleted the late-bound-order branch July 6, 2022 20:32
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3dcb616): comparison url.

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
N/A N/A 0
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-2.1% -2.1% 1
All 😿🎉 (primary) N/A N/A 0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change

  2. number of relevant changes

@apiraino
Copy link
Contributor

apiraino commented Jul 7, 2022

Beta backport approved 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 7, 2022
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 9, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.64.0, 1.63.0 Jul 9, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2022
…ulacrum

[beta] backport rollup

*  Return a FxIndexSet in is_late_bound query. rust-lang#98959
*  rustdoc: filter '_ lifetimes from ty::PolyTraitRef rust-lang#98727
* don't succeed evaluate_obligation query if new opaque types were registered rust-lang#98614
*  Update llvm-project rust-lang#98567

There's a few more as-yet-unapproved/unmerged PRs that'll land later, but creating a partial rollup for now so that we can include at least some PRs in the first crater run.

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

Incremental compilation bug with async fn method capturing multiple lifetimes
9 participants