Uh oh!
There was an error while loading. Please reload this page.
typeck: Fix const generic in repeat param ICE. - #61698
Merged
Merged
Conversation
Uh oh!
There was an error while loading. Please reload this page.
davidtwcoforce-pushed
the
ice-const-generic-length
branch
from
June 9, 2019 21:00
0efc78c to
cdcb7e6CompareCentril
reviewed
Jun 9, 2019
Uh oh!
There was an error while loading. Please reload this page.
davidtwcoforce-pushed
the
ice-const-generic-length
branch
from
June 10, 2019 07:24
cdcb7e6 to
2a3e004Comparevarkor
reviewed
Jun 10, 2019
Uh oh!
There was an error while loading. Please reload this page.
Contributor
There was a problem hiding this comment.
Could we also have a test where we make sure that this does the right thing? E.g. pass in N explicitly and check the return value.
MemberAuthor
There was a problem hiding this comment.
I've added another test. It will error later in the compiler with a "array lengths can't depend on generic parameters" error, emitted when creating the HAIR. From a quick look, it appears that the MIR/HAIR data structures all contain a u64 for the count, so it isn't trivial to change one or two lines and make this work, probably best left for a follow-up (which I'd be interested in trying to tackle). It's an improvement over an ICE in any case.
Contributor
There was a problem hiding this comment.
Ah, okay. Yes, this is certainly better than an ICE, and this gives us a good minimal example to fix. Let's open an issue for it after this is merged.
Uh oh!
There was an error while loading. Please reload this page.
This commit fixes an ICE that occured when a const generic was used in a repeat expression. This was due to the code expecting the length of the repeat expression to be const evaluatable to a constant, but a const generic parameter is not (however, it can be made into a constant).
davidtwcoforce-pushed
the
ice-const-generic-length
branch
from
June 10, 2019 15:59
2a3e004 to
9ed4674Comparevarkor
commented
Jun 10, 2019
Contributor
@bors r+ |
bors
commented
Jun 10, 2019
Collaborator
📌 Commit 9ed4674 has been approved by |
Centril added a commit
to Centril/rust
that referenced
this pull request
Jun 11, 2019
… r=varkor typeck: Fix const generic in repeat param ICE. Fixesrust-lang#61336. Turns out this wasn't related to rust-lang#49147 after all. r? @varkor
Centril added a commit
to Centril/rust
that referenced
this pull request
Jun 11, 2019
… r=varkor typeck: Fix const generic in repeat param ICE. Fixesrust-lang#61336. Turns out this wasn't related to rust-lang#49147 after all. r? @varkor
Centril added a commit
to Centril/rust
that referenced
this pull request
Jun 11, 2019
… r=varkor typeck: Fix const generic in repeat param ICE. Fixesrust-lang#61336. Turns out this wasn't related to rust-lang#49147 after all. r? @varkor
bors added a commit
that referenced
this pull request
Jun 11, 2019
Rollup of 11 pull requests Successful merges: - #61518 (Add loops to doc list of things not stable in const fn) - #61526 (move some tests into subfolders) - #61550 (Windows 10 SDK is also required now.) - #61606 (Remove some legacy proc macro flavors) - #61652 (Mention slice patterns in array) - #61686 (librustc_errors: Add some more documentation) - #61698 (typeck: Fix const generic in repeat param ICE.) - #61707 (Azure: retry failed awscli installs) - #61715 (make sure make_ascii_lowercase actually leaves upper-case non-ASCII characters alone) - #61724 (core: use memcmp optimization for 128 bit integer slices) - #61726 (Use `for_each` in `Iterator::partition`) Failed merges: r? @ghost
bors added a commit
that referenced
this pull request
Jun 11, 2019
Rollup of 11 pull requests Successful merges: - #61518 (Add loops to doc list of things not stable in const fn) - #61526 (move some tests into subfolders) - #61550 (Windows 10 SDK is also required now.) - #61606 (Remove some legacy proc macro flavors) - #61652 (Mention slice patterns in array) - #61686 (librustc_errors: Add some more documentation) - #61698 (typeck: Fix const generic in repeat param ICE.) - #61707 (Azure: retry failed awscli installs) - #61715 (make sure make_ascii_lowercase actually leaves upper-case non-ASCII characters alone) - #61724 (core: use memcmp optimization for 128 bit integer slices) - #61726 (Use `for_each` in `Iterator::partition`) Failed merges: r? @ghost
davidtwco added a commit
to davidtwco/rust
that referenced
this pull request
Jun 13, 2019
This commit extends the work in rust-lang#61698 to get the `DefId` of const parameters from block that resolve to a const parameter (as well as const parameters directly, as it was previously).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes#61336. Turns out this wasn't related to #49147 after all.
r? @varkor