Switch to `EarlyBinder` for `type_of` query #107753

kylematsuda · 2023-02-07T08:41:20Z

Part of the work to finish #105779 and implement rust-lang/types-team#78.

Several queries X have a bound_X variant that wraps the output in EarlyBinder. This adds EarlyBinder to the return type of the type_of query and removes bound_type_of.

r? @lcnr

rustbot · 2023-02-07T08:41:32Z

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

kylematsuda

Here are the places where I thought there were potential substs but wasn't sure whether they should be used

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

compiler/rustc_borrowck/src/universal_regions.rs

compiler/rustc_hir_analysis/src/variance/constraints.rs

kylematsuda · 2023-02-07T08:49:39Z

compiler/rustc_hir_typeck/src/method/suggest.rs

@@ -906,8 +906,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                        // different from the received one
                                        // So we avoid suggestion method with Box<Self>
                                        // for instance
-                                        self.tcx.at(span).type_of(*def_id) != rcvr_ty
-                                            && self.tcx.at(span).type_of(*def_id) != rcvr_ty


This is sort of unrelated to adding EarlyBinder, but I was confused by this... what's going on here?

yeah this is really odd lol I have no idea why its checking the same condition twice...

Hi, so I did a little digging on this and tracked it down to #104422 (which renamed actual to rcvr_ty, whereas originally both names were in scope). I might try to think of a test case where the original check is needed

compiler/rustc_lint/src/builtin.rs

compiler/rustc_middle/src/ty/print/pretty.rs

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

bors · 2023-02-08T01:27:16Z

☔ The latest upstream changes (presumably #107768) made this pull request unmergeable. Please resolve the merge conflicts.

BoxyUwU · 2023-02-08T11:28:25Z

r? @BoxyUwU

lcnr · 2023-02-08T11:45:52Z

handing this off to @BoxyUwU as I don't have a lot of time atm ^^

I realized is that the reason I didn't see your comments in your previous PR was that they are for the commit which uses bound_X everywhere and I tend to only review the the final state of the PR. For future PRs it is probably better to only comment on the final changes as dealing with comments on specific diffs isn't great.

Thanks for your work ❤️

bors · 2023-02-13T21:09:05Z

☔ The latest upstream changes (presumably #107924) made this pull request unmergeable. Please resolve the merge conflicts.

compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

compiler/rustc_const_eval/src/interpret/memory.rs

compiler/rustc_hir_analysis/src/astconv/mod.rs

compiler/rustc_hir_typeck/src/demand.rs

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

compiler/rustc_hir_typeck/src/method/confirm.rs

compiler/rustc_hir_typeck/src/method/probe.rs

compiler/rustc_infer/src/infer/mod.rs

compiler/rustc_middle/src/ty/consts.rs

compiler/rustc_middle/src/ty/context.rs

compiler/rustc_trait_selection/src/traits/select/confirmation.rs

src/librustdoc/clean/mod.rs

kylematsuda · 2023-02-14T23:56:59Z

Hi @BoxyUwU, thanks for reviewing! I implemented all of those changes in the 2nd to last commit; the last commit is just a small change that came up when I rebased 😃

bors · 2023-02-15T16:07:33Z

☔ The latest upstream changes (presumably #108079) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2023-02-15T20:02:53Z

☔ The latest upstream changes (presumably #108006) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2023-02-16T04:29:01Z

☔ The latest upstream changes (presumably #108096) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2023-02-16T20:13:10Z

☔ The latest upstream changes (presumably #108020) made this pull request unmergeable. Please resolve the merge conflicts.

…ype_of in metadata

rust-timer · 2023-02-17T09:34:50Z

Finished benchmarking commit (9556b56): 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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

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

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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-3.9%, -1.2%]	9
All ❌✅ (primary)	-	-	0

Switch to `EarlyBinder` for `type_of` query Part of the work to finish rust-lang#105779 and implement rust-lang/types-team#78. Several queries `X` have a `bound_X` variant that wraps the output in `EarlyBinder`. This adds `EarlyBinder` to the return type of the `type_of` query and removes `bound_type_of`. r? `@lcnr`

Remove some superfluous type parameters from layout.rs rust-lang/rust#107163 Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 Unify validity checks into a single query rust-lang/rust#108364 s/eval_usize/eval_target_usize/ for clarity rust-lang/rust#108029 Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047 Switch to EarlyBinder for type_of query rust-lang/rust#107753 Rename interner funcs rust-lang/rust#108250 Optimize mk_region rust-lang/rust#108020 Clarify iterator interners rust-lang/rust#108112

- Remove some superfluous type parameters from layout.rs rust-lang/rust#107163 - Introduce -Zterminal-urls to use OSC8 for error codes rust-lang/rust#107838 - Unify validity checks into a single query rust-lang/rust#108364 - s/eval_usize/eval_target_usize/ for clarity rust-lang/rust#108029 - Use target instead of machine for mir interpreter integer handling rust-lang/rust#108047 - Switch to EarlyBinder for type_of query rust-lang/rust#107753 - Rename interner funcs rust-lang/rust#108250 - Optimize mk_region rust-lang/rust#108020 - Clarify iterator interners rust-lang/rust#108112

Upstream PRs that require local changes: - Switch to EarlyBinder for type_of query rust-lang/rust#107753 - Factor query arena allocation out from query caches rust-lang/rust#107833 Co-authored-by: Qinheping Hu <qinhh@amazon.com>

… r=BoxyUwU Make `(try_)subst_and_normalize_erasing_regions` take `EarlyBinder` Changes `subst_and_normalize_erasing_regions` and `try_subst_and_normalize_erasing_regions` to take `EarlyBinder<T>` instead of `T`. (related to rust-lang#105779) This was suggested by `@BoxyUwU` in rust-lang#107753 (comment). After changing `type_of` to return `EarlyBinder`, there were several places where the binder was immediately skipped to call `tcx.subst_and_normalize_erasing_regions`, only for the binder to be reconstructed inside of that method. r? `@BoxyUwU`

This requires fixing some nightly APIs that have been changed in the latest nightly compiler. For reference, the PR in rustc for the API change in rustc crate: rust-lang/rust#107753 The tracking issue for the 'drain_filter' which is renamed to 'extract_if': rust-lang/rust#43244 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

This requires fixing some nightly APIs that have been changed in the latest nightly compiler. For reference, the PR in rustc for the API change in rustc crate: rust-lang/rust#107753 The tracking issue for the 'drain_filter' which is renamed to 'extract_if': rust-lang/rust#43244 Fixes servo#29467 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

rustbot assigned lcnr Feb 7, 2023

kylematsuda commented Feb 7, 2023

View reviewed changes

kylematsuda force-pushed the type-of branch from ad5038c to b0cc9d4 Compare February 8, 2023 06:13

rustbot assigned BoxyUwU and unassigned lcnr Feb 8, 2023

BoxyUwU reviewed Feb 14, 2023

View reviewed changes

kylematsuda force-pushed the type-of branch from b0cc9d4 to 8850826 Compare February 14, 2023 22:35

kylematsuda force-pushed the type-of branch from 8850826 to 3dd4f2a Compare February 15, 2023 16:48

kylematsuda force-pushed the type-of branch from 3dd4f2a to 77cb920 Compare February 15, 2023 20:50

kylematsuda force-pushed the type-of branch from 77cb920 to c3c4424 Compare February 16, 2023 17:47

kylematsuda added 4 commits February 16, 2023 17:01

change usages of type_of to bound_type_of

d822b97

remove bound_type_of query; make type_of return EarlyBinder; change t…

c183110

…ype_of in metadata

changes from review

8e92849

fix new usage of type_of

f6c3469

This was referenced Feb 17, 2023

Type-directed probing for inherent associated types #105961

Merged

Clarify iterator interners #108112

Merged

This was referenced Feb 17, 2023

ICE const parameter types cannot be generic, generic_const_exprs #108165

Closed

fix ICE const parameters cannot be generic in generic_const_exprs #108172

Closed

Jesse-Bakker mentioned this pull request Mar 1, 2023

Remove duplicate guard in diagnostic method suggest #108574

Closed

mukilan mentioned this pull request Mar 6, 2023

'Test with nightly rustc' job is failing. servo/servo#29467

Closed

qinheping mentioned this pull request Mar 10, 2023

Upgrade toolchain to nightly-2023-03-09 model-checking/kani#2293

Closed

4 tasks

kylematsuda mentioned this pull request Apr 13, 2023

Make (try_)subst_and_normalize_erasing_regions take EarlyBinder #110297

Merged

tautschnig mentioned this pull request Apr 17, 2023

Upgrade Rust toolchain to nightly-2023-02-18 model-checking/kani#2384

Merged

3 tasks

clubby789 mentioned this pull request Jul 9, 2023

ICE: const parameters cannot be generic #113462

Closed

matthiaskrgr mentioned this pull request Aug 15, 2023

ICE: 'is_trivially_sized' applied to unexpected type #114872

Closed

matthiaskrgr mentioned this pull request Nov 18, 2023

ice: non_lifetime_binders: bound types encountered in structurally_relate_tys #118038

Open

matthiaskrgr mentioned this pull request Dec 24, 2023

ICE: predicates_of.rs: no entry found for key #119275

Closed

matthiaskrgr mentioned this pull request Jan 1, 2024

ICE: no entry found for key, expr.rs #119489

Closed

matthiaskrgr mentioned this pull request Feb 22, 2024

ICE: could not resolve DefId #121422

Closed

matthiaskrgr mentioned this pull request Mar 27, 2024

ICE: unexpected infer type #123140

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to `EarlyBinder` for `type_of` query #107753

Switch to `EarlyBinder` for `type_of` query #107753

kylematsuda commented Feb 7, 2023

rustbot commented Feb 7, 2023

kylematsuda left a comment

kylematsuda Feb 7, 2023

BoxyUwU Feb 14, 2023

kylematsuda Feb 14, 2023

bors commented Feb 8, 2023

BoxyUwU commented Feb 8, 2023

lcnr commented Feb 8, 2023

bors commented Feb 13, 2023

kylematsuda commented Feb 14, 2023

bors commented Feb 15, 2023

bors commented Feb 15, 2023

bors commented Feb 16, 2023

bors commented Feb 16, 2023

rust-timer commented Feb 17, 2023

Switch to EarlyBinder for type_of query #107753

Switch to EarlyBinder for type_of query #107753

Conversation

kylematsuda commented Feb 7, 2023

rustbot commented Feb 7, 2023

kylematsuda left a comment

Choose a reason for hiding this comment

kylematsuda Feb 7, 2023

Choose a reason for hiding this comment

BoxyUwU Feb 14, 2023

Choose a reason for hiding this comment

kylematsuda Feb 14, 2023

Choose a reason for hiding this comment

bors commented Feb 8, 2023

BoxyUwU commented Feb 8, 2023

lcnr commented Feb 8, 2023

bors commented Feb 13, 2023

kylematsuda commented Feb 14, 2023

bors commented Feb 15, 2023

bors commented Feb 15, 2023

bors commented Feb 16, 2023

bors commented Feb 16, 2023

rust-timer commented Feb 17, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Switch to `EarlyBinder` for `type_of` query #107753

Switch to `EarlyBinder` for `type_of` query #107753