Move things to `rustc_type_ir` #97287

compiler-errors · 2022-05-22T20:45:12Z

Finishes some work proposed in rust-lang/compiler-team#341.

compiler/rustc_middle/src/ty/context.rs

…idtwco Lifetime variance fixes for rustc rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be unified by shortening both to some common lifetime. This is doable, since many lifetimes are already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the compiler team can review independently.

…rk-Simulacrum Lifetime variance fixes for clippy rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be shortened to some common lifetime. This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the clippy team can review independently.

bors · 2022-05-24T07:58:08Z

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

…ylan-DPC Lifetime variance fixes for rustdoc rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be unified by shortening both to some common lifetime. This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the rustdoc team can review independently.

…pes-in-a-trenchcoat, r=cjgillot Split out the various responsibilities of `rustc_metadata::Lazy` `Lazy<T>` actually acts like three different types -- a pointer in the crate metadata to a single value, a pointer to a list/array of values, and an indexable pointer of a list of values (a table). We currently overload `Lazy<T>` to work differently than `Lazy<[T]>` and the same for `Lazy<Table<I, T>>`. All is well with some helper adapter traits such as [`LazyQueryDecodable`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_metadata/rmeta/decoder/trait.LazyQueryDecodable.html) and [`EncodeContentsForLazy`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_metadata/rmeta/encoder/trait.EncodeContentsForLazy.html). Well, changes in rust-lang#97287 that make `Lazy` work with the now invariant lifetime `'tcx` make these adapters fall apart because of coherence reasons. So we split out these three types and rework some of the helper traits so it's both 1. more clear to understand, and 2. compatible with the changes later in that PR. Split out from rust-lang#97287 so it can be reviewed separately, since this PR stands on its own.

…ylan-DPC Lifetime variance fixes for rustdoc rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be unified by shortening both to some common lifetime. This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the rustdoc team can review independently.

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_type_ir/src/sty.rs

compiler/rustc_middle/src/ty/vtable.rs

compiler/rustc_middle/src/ty/sty.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_type_ir/src/sty.rs

compiler-errors · 2022-05-24T20:25:49Z

@rustbot author

Will address @jackh726's comments and need to fix the clippy lint.

jackh726 · 2022-05-24T20:41:38Z

I think the "Make Lazy not care about lifetimes until decode" commit can also be split out into a separate PR?

compiler/rustc_middle/src/ty/mod.rs

…ustc_type_ir

oli-obk · 2022-05-29T07:17:00Z

compiler/rustc_middle/src/ty/context.rs

+    type Mutability = hir::Mutability;
+    type Movability = hir::Movability;


We should probably check if we can start moving some of these types into rustc_type_ir

Yes, we can. When I originally wrote this, the idea was to be as small as possible by trading extra associated types.

oli-obk · 2022-05-29T07:17:27Z

@bors r=jackh726,oli-obk

bors · 2022-05-29T07:17:29Z

📌 Commit 4638915 has been approved by jackh726,oli-obk

bors · 2022-05-29T08:20:16Z

⌛ Testing commit 4638915 with merge 0f06824...

bors · 2022-05-29T10:43:32Z

☀️ Test successful - checks-actions
Approved by: jackh726,oli-obk
Pushing 0f06824 to master...

rust-highfive · 2022-05-29T10:43:59Z

📣 Toolstate changed by #97287!

Tested on commit 0f06824.
Direct link to PR: #97287

💔 miri on windows: test-fail → build-fail (cc @eddyb @oli-obk @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @eddyb @oli-obk @RalfJung).

@eddyb

Tested on commit rust-lang/rust@0f06824. Direct link to PR: <rust-lang/rust#97287> 💔 miri on windows: test-fail → build-fail (cc @eddyb @oli-obk @RalfJung). 💔 miri on linux: test-fail → build-fail (cc @eddyb @oli-obk @RalfJung).

rust-timer · 2022-05-29T12:01:19Z

Finished benchmarking commit (0f06824): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	0.5%	0.7%	9
Regressions 😿 (secondary)	1.1%	1.1%	3
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	0.5%	0.7%	9

Max RSS (memory usage)

Results

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	2.8%	3.2%	2
Regressions 😿 (secondary)	3.2%	4.7%	3
Improvements 🎉 (primary)	-2.3%	-2.3%	1
Improvements 🎉 (secondary)	-1.3%	-1.4%	2
All 😿🎉 (primary)	1.1%	3.2%	3

Cycles

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	3.9%	3.9%	1
Improvements 🎉 (primary)	-3.1%	-3.1%	1
Improvements 🎉 (secondary)	-2.9%	-3.4%	2
All 😿🎉 (primary)	-3.1%	-3.1%	1

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

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

jackh726 · 2022-05-29T12:18:39Z

Yay

pnkfelix · 2022-05-31T20:52:26Z

During development, this PR was identified as regressing one primary benchmark, bitmaps (in a variety of contexts), and the PR author said better to take that perf hit and deal with it later.
In the PR that landed, the number of regressing variants was smaller, but the affected set of benchmarks slightly larger: both bitmaps and unicode-normalization are affected, regressing by 0.35% to 0.70%.
My very brief inpsection of the flamegraphs (old, new) didn't show any smoking guns.
At this point I think we can just live with this performance hit.

@rustbot label: +perf-regression-triaged

…rk-Simulacrum Lifetime variance fixes for clippy rust-lang#97287 migrates rustc to a `Ty` type that is invariant over its lifetime `'tcx`, so I need to fix a bunch of places that assume that `Ty<'a>` and `Ty<'b>` can be shortened to some common lifetime. This is doable, since everything is already `'tcx`, so all this PR does is be a bit more explicit that elided lifetimes are actually `'tcx`. Split out from rust-lang#97287 so the clippy team can review independently.

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 22, 2022

This was referenced May 22, 2022

Lifetime variance fixes for rustdoc #97288

Merged

Lifetime variance fixes for clippy #97289

Merged

This comment has been minimized.

Sign in to view

compiler-errors mentioned this pull request May 22, 2022

Split out the various responsibilities of rustc_metadata::Lazy #97291

Merged

compiler-errors force-pushed the type-interner branch 3 times, most recently from f76f458 to 034b09e Compare May 22, 2022 21:21

compiler-errors mentioned this pull request May 22, 2022

Lifetime variance fixes for rustc #97292

Merged

compiler-errors force-pushed the type-interner branch from 034b09e to 8a55b3e Compare May 22, 2022 21:34

This comment has been minimized.

Sign in to view

oli-obk reviewed May 23, 2022

View reviewed changes

compiler/rustc_middle/src/ty/context.rs Outdated Show resolved Hide resolved

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 24, 2022

jackh726 reviewed May 24, 2022

View reviewed changes

compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_type_ir/src/sty.rs Show resolved Hide resolved

compiler/rustc_middle/src/ty/vtable.rs Outdated Show resolved Hide resolved

jackh726 reviewed May 24, 2022

View reviewed changes

compiler/rustc_middle/src/ty/sty.rs Outdated Show resolved Hide resolved

compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_type_ir/src/sty.rs Outdated Show resolved Hide resolved

compiler-errors force-pushed the type-interner branch from 8a55b3e to 97f2cf5 Compare May 24, 2022 20:24

This comment has been minimized.

Sign in to view

SkiFire13 reviewed May 28, 2022

View reviewed changes

compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved

detrumi and others added 5 commits May 28, 2022 11:38

Move things to rustc_type_ir

a7015fe

Initial fixes on top of type interner commit

a056a95

Fix TyKind lint, make consts no longer fn, etc

34e0581

Remove some comments, inline interner fn

f05a92d

Make TyCtxt implement Interner, make HashStable generic and move to r…

4638915

…ustc_type_ir

compiler-errors force-pushed the type-interner branch from 3e238c6 to 4638915 Compare May 28, 2022 19:16

compiler-errors removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 28, 2022

oli-obk reviewed May 29, 2022

View reviewed changes

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 May 29, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label May 29, 2022

bors merged commit 0f06824 into rust-lang:master May 29, 2022

rustbot added this to the 1.63.0 milestone May 29, 2022

bors mentioned this pull request May 29, 2022

Introduce -Zvirtual-function-elimination codegen flag #96285

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label May 31, 2022

JohnTitor added a commit to JohnTitor/rustc-dev-guide that referenced this pull request Feb 2, 2023

Address the change in rust-lang/rust#97287

94774b4

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

tshepang pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Feb 3, 2023

Address the change in rust-lang/rust#97287

e0074c1

Signed-off-by: Yuki Okushi <jtitor@2k36.org>

compiler-errors deleted the type-interner branch August 11, 2023 20:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move things to `rustc_type_ir` #97287

Move things to `rustc_type_ir` #97287

compiler-errors commented May 22, 2022 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

bors commented May 24, 2022

compiler-errors commented May 24, 2022

This comment has been minimized.

jackh726 commented May 24, 2022

oli-obk May 29, 2022

jackh726 May 29, 2022

oli-obk commented May 29, 2022

bors commented May 29, 2022

bors commented May 29, 2022

bors commented May 29, 2022

rust-highfive commented May 29, 2022

rust-timer commented May 29, 2022

jackh726 commented May 29, 2022

pnkfelix commented May 31, 2022

		type Mutability = hir::Mutability;
		type Movability = hir::Movability;

Move things to rustc_type_ir #97287

Move things to rustc_type_ir #97287

Conversation

compiler-errors commented May 22, 2022 • edited Loading

This comment has been minimized.

This comment has been minimized.

bors commented May 24, 2022

compiler-errors commented May 24, 2022

This comment has been minimized.

jackh726 commented May 24, 2022

oli-obk May 29, 2022

Choose a reason for hiding this comment

jackh726 May 29, 2022

Choose a reason for hiding this comment

oli-obk commented May 29, 2022

bors commented May 29, 2022

bors commented May 29, 2022

bors commented May 29, 2022

rust-highfive commented May 29, 2022

rust-timer commented May 29, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

jackh726 commented May 29, 2022

pnkfelix commented May 31, 2022

Move things to `rustc_type_ir` #97287

Move things to `rustc_type_ir` #97287

compiler-errors commented May 22, 2022 •

edited

Loading