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 convert valtree to constvalue during normalization #102137

Merged
merged 2 commits into from
Sep 23, 2022
Merged

Don't convert valtree to constvalue during normalization #102137

merged 2 commits into from
Sep 23, 2022

Conversation

b-naber
Copy link
Contributor

@b-naber b-naber commented Sep 22, 2022

r? @lcnr

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 22, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2022
lcnr
lcnr reviewed Sep 22, 2022
View reviewed changes
compiler/rustc_trait_selection/src/traits/query/normalize.rs Outdated
@@ -353,18 +353,8 @@ impl<'cx, 'tcx> FallibleTypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
) -> Result<mir::ConstantKind<'tcx>, Self::Error> {
Ok(match constant {
mir::ConstantKind::Ty(c) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

now that's just the default impl, isn't it? 😁

don't think you have to overwrite this method at all now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

^^

Copy link
Contributor Author

Choose a reason for hiding this comment

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

eh actually it isnt ^^: https://doc.rust-lang.org/nightly/nightly-rustc/src/rustc_middle/ty/fold.rs.html#193

Copy link
Contributor

@lcnr lcnr Sep 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

ah, then just c.try_super_fold_with without the match i guess 😁

@lcnr lcnr added the A-const-generics Area: const generics (parameters and arguments) label Sep 22, 2022
@b-naber b-naber force-pushed the lazy-const-val-conversion branch 2 times, most recently from 6004465 to 44bec45 Compare September 22, 2022 12:37
@lcnr
Copy link
Contributor

lcnr commented Sep 22, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 22, 2022
@lcnr
Copy link
Contributor

lcnr commented Sep 22, 2022

with acceptable perf, r=me

@bors delegate+

@bors
Copy link
Contributor

bors commented Sep 22, 2022

⌛ Trying commit a9e657d with merge b059e0b03e4ae83abad1f5af13263e9fd8bdb23d...

@bors
Copy link
Contributor

bors commented Sep 22, 2022

✌️ @b-naber can now approve this pull request

@bors
Copy link
Contributor

bors commented Sep 22, 2022

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

@rust-timer
Copy link
Collaborator

Queued b059e0b03e4ae83abad1f5af13263e9fd8bdb23d with parent c10f7d7, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b059e0b03e4ae83abad1f5af13263e9fd8bdb23d): 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-review -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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 5.8% [5.8%, 5.8%] 1
Improvements ✅
(primary)		 -3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)		 -3.3% [-4.4%, -1.8%] 4
All ❌✅ (primary) -3.4% [-3.4%, -3.4%] 1

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change ↩

  2. number of relevant changes ↩

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 22, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr
Copy link
Contributor

lcnr commented Sep 23, 2022

@bors r+ rollup=always

@bors
Copy link
Contributor

bors commented Sep 23, 2022

📌 Commit ded3eda has been approved by lcnr

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 23, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 23, 2022
@matthiaskrgr
Rollup merge of rust-lang#102137 - b-naber:lazy-const-val-conversion,…
7301951 
… r=lcnr

Don't convert valtree to constvalue during normalization

r? `@lcnr`
This was referenced Sep 23, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 23, 2022
@bors
Auto merge of rust-lang#102192 - matthiaskrgr:rollup-0ctjzco, r=matth…
4a14677 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102094 (Add missing documentation for `bool::from_str`)
 - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`)
 - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`)
 - rust-lang#102137 (Don't convert valtree to constvalue during normalization)
 - rust-lang#102148 (add regression test for miri issue 2433)
 - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings)
 - rust-lang#102177 (Fix a typo in `std`'s root docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3a8bad9 into rust-lang:master Sep 23, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 23, 2022
oli-obk pushed a commit to oli-obk/rust that referenced this pull request Sep 28, 2022
@bors
Auto merge of rust-lang#102192 - matthiaskrgr:rollup-0ctjzco, r=matth…
1da69f2 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102094 (Add missing documentation for `bool::from_str`)
 - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`)
 - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`)
 - rust-lang#102137 (Don't convert valtree to constvalue during normalization)
 - rust-lang#102148 (add regression test for miri issue 2433)
 - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings)
 - rust-lang#102177 (Fix a typo in `std`'s root docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#102192 - matthiaskrgr:rollup-0ctjzco, r=matth…
6e81886 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#102094 (Add missing documentation for `bool::from_str`)
 - rust-lang#102115 (Add examples to `bool::then` and `bool::then_some`)
 - rust-lang#102134 (Detect panic strategy using `rustc --print cfg`)
 - rust-lang#102137 (Don't convert valtree to constvalue during normalization)
 - rust-lang#102148 (add regression test for miri issue 2433)
 - rust-lang#102158 (rustdoc: clean up CSS/DOM for deprecation warnings)
 - rust-lang#102177 (Fix a typo in `std`'s root docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@clubby789 clubby789 mentioned this pull request May 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
A-const-generics Area: const generics (parameters and arguments) 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
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.
7 participants
@b-naber @lcnr @rust-timer @bors @rust-log-analyzer @rust-highfive @rustbot