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.

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

typeck: Fix ICE for blocks in repeat expr count. #61805

Merged

Conversation

Projects
None yet
4 participants
@davidtwco
Copy link
Member

commented Jun 13, 2019

Fixes #61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

typeck: Fix ICE for blocks in repeat expr count.
This commit extends the work in #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).

@davidtwco davidtwco force-pushed the davidtwco:ice-const-generic-repeat-expr-count-sequel branch from e4dcf2e to bc36aab Jun 13, 2019

@varkor

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

📌 Commit bc36aab has been approved by varkor

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61819 - Centril:rollup-k2gprnz, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #61704 (Pass LLVM linker flags to librustc_llvm build)
 - #61792 (Add ui test for issue 51301)
 - #61803 (typeck: small refactoring, add 'fn write_resolution')
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61818 (Issue #60709 test)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61819 - Centril:rollup-k2gprnz, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #61704 (Pass LLVM linker flags to librustc_llvm build)
 - #61792 (Add ui test for issue 51301)
 - #61803 (typeck: small refactoring, add 'fn write_resolution')
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61818 (Issue #60709 test)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61823 - Centril:rollup-p5umchm, r=Centril
Rollup of 4 pull requests

Successful merges:

 - #61771 (Update cargo)
 - #61792 (Add ui test for issue 51301)
 - #61803 (typeck: small refactoring, add 'fn write_resolution')
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61841 - Centril:rollup-0ot369l, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #59752 (Limit dylib symbols)
 - #61767 (Updates smallvec and new_debug_unreachable)
 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61824 (in which we decline to lint single-use lifetimes in `derive`d impls)
 - #61825 (type_alias_enum_variants: fix #61801; allow a path pattern to infer)
 - #61827 (Fix rust-lldb wrapper scripts.)
 - #61829 (rustbuild: include llvm-libunwind in dist tarball)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61850 - Centril:rollup-031fj0d, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #59752 (Limit dylib symbols)
 - #61143 (When suggesting borrow, remove useless clones)
 - #61767 (Updates smallvec and new_debug_unreachable)
 - #61781 (prepare for Intptrcast model)
 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61824 (in which we decline to lint single-use lifetimes in `derive`d impls)
 - #61825 (type_alias_enum_variants: fix #61801; allow a path pattern to infer)
 - #61844 (Change `...` to `..=` where applicable)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jun 14, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61852 - Centril:rollup-9ksf5f5, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #61143 (When suggesting borrow, remove useless clones)
 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61825 (type_alias_enum_variants: fix #61801; allow a path pattern to infer)
 - #61844 (Change `...` to `..=` where applicable)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jun 14, 2019

Auto merge of #61852 - Centril:rollup-9ksf5f5, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #61143 (When suggesting borrow, remove useless clones)
 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61825 (type_alias_enum_variants: fix #61801; allow a path pattern to infer)
 - #61844 (Change `...` to `..=` where applicable)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jun 15, 2019

Rollup merge of rust-lang#61805 - davidtwco:ice-const-generic-repeat-…
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor

bors added a commit that referenced this pull request Jun 15, 2019

Auto merge of #61868 - Centril:rollup-gglsecp, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61824 (in which we decline to lint single-use lifetimes in `derive`d impls)
 - #61844 (Change `...` to `..=` where applicable)
 - #61854 (Minor cosmetic improvements to accompany PR 61825)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jun 15, 2019

Auto merge of #61868 - Centril:rollup-gglsecp, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61824 (in which we decline to lint single-use lifetimes in `derive`d impls)
 - #61844 (Change `...` to `..=` where applicable)
 - #61854 (Minor cosmetic improvements to accompany PR 61825)

Failed merges:

r? @ghost

@bors bors merged commit bc36aab into rust-lang:master Jun 15, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
pr Build #20190613.43 succeeded
Details

@davidtwco davidtwco deleted the davidtwco:ice-const-generic-repeat-expr-count-sequel branch Jun 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.