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

Don't store lazyness in DefKind::TyAlias #116163

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Don't store lazyness in DefKind::TyAlias #116163

merged 1 commit into from
Sep 27, 2023

Conversation

compiler-errors
Copy link
Member

  1. Don't store lazyness of a type alias in its DefKind, but instead via a query.
  2. This allows us to treat type aliases as lazy if #[feature(lazy_type_alias)] OR if the alias contains a TAIT, rather than having checks for both in separate parts of the codebase.

r? @oli-obk cc @fmease

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 26, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2023

Some changes occurred to the core trait solver

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

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 26, 2023
@bors
Copy link
Contributor

bors commented Sep 26, 2023

⌛ Trying commit 88ef3a2 with merge a4bf23b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2023
@bors
Auto merge of rust-lang#116163 - compiler-errors:lazyness, r=<try>
a4bf23b 
Don't store lazyness in `DefKind::TyAlias`

1. Don't store lazyness of a type alias in its `DefKind`, but instead via a query.
2. This allows us to treat type aliases as lazy if `#[feature(lazy_type_alias)]` *OR* if the alias contains a TAIT, rather than having checks for both in separate parts of the codebase.

r? `@oli-obk` cc `@fmease`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Sep 26, 2023

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

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

compiler-errors
compiler-errors commented Sep 26, 2023
View reviewed changes
tests/ui/associated-inherent-types/type-alias-bounds-are-enforced.rs
// compile-flags: --crate-type=lib
// check-pass
Copy link
Member Author

Choose a reason for hiding this comment

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

We no longer call type_of in variance computation on type aliases to determine if it's a TAIT, since we go through the type_alias_is_lazy query operating on HIR.

@compiler-errors
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Sep 26, 2023

⌛ Trying commit d6ce9ce with merge b3abcff...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2023
@bors
Auto merge of rust-lang#116163 - compiler-errors:lazyness, r=<try>
b3abcff 
Don't store lazyness in `DefKind::TyAlias`

1. Don't store lazyness of a type alias in its `DefKind`, but instead via a query.
2. This allows us to treat type aliases as lazy if `#[feature(lazy_type_alias)]` *OR* if the alias contains a TAIT, rather than having checks for both in separate parts of the codebase.

r? `@oli-obk` cc `@fmease`
@bors
Copy link
Contributor

bors commented Sep 26, 2023

☀️ Try build successful - checks-actions
Build commit: b3abcff (b3abcffe9e78d264457ef25f53bc7279cb3e95ad)

@rust-timer

This comment has been minimized.

Sign in to view
@xFrednet xFrednet mentioned this pull request Sep 26, 2023
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b3abcff): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

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)		 -0.7% [-0.7%, -0.7%] 1
All ❌✅ (primary) - - 0

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)		 -1.9% [-1.9%, -1.9%] 1
All ❌✅ (primary) - - 0

Binary size

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.0% [0.0%, 0.0%] 2
Improvements ✅
(primary)		 -0.0% [-0.0%, -0.0%] 8
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.0% [-0.0%, -0.0%] 8

Bootstrap: 631.966s -> 631.546s (-0.07%)
Artifact size: 317.23 MiB -> 317.15 MiB (-0.03%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 26, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Sep 26, 2023

@bors r+ rollup-

@bors
Copy link
Contributor

bors commented Sep 26, 2023

📌 Commit d6ce9ce has been approved by oli-obk

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 Sep 26, 2023
@bors
Copy link
Contributor

bors commented Sep 27, 2023

⌛ Testing commit d6ce9ce with merge 6b99cf1...

@bors
Copy link
Contributor

bors commented Sep 27, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6b99cf1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 27, 2023
@bors bors merged commit 6b99cf1 into rust-lang:master Sep 27, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 27, 2023
@bors bors mentioned this pull request Sep 27, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6b99cf1): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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.5% [0.5%, 0.5%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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.0% [0.0%, 0.0%] 2
Improvements ✅
(primary)		 -0.0% [-0.0%, -0.0%] 8
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.0% [-0.0%, -0.0%] 8

Bootstrap: 630.538s -> 629.316s (-0.19%)
Artifact size: 317.11 MiB -> 317.14 MiB (0.01%)

flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 6, 2023
@bors
Auto merge of rust-lang#116163 - compiler-errors:lazyness, r=oli-obk
3b75db7 
Don't store lazyness in `DefKind::TyAlias`

1. Don't store lazyness of a type alias in its `DefKind`, but instead via a query.
2. This allows us to treat type aliases as lazy if `#[feature(lazy_type_alias)]` *OR* if the alias contains a TAIT, rather than having checks for both in separate parts of the codebase.

r? `@oli-obk` cc `@fmease`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.
6 participants
@compiler-errors @rustbot @rust-timer @bors @rust-log-analyzer @oli-obk