mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #103870 - TaKO8Ki:fix-103790, r=fee1-dead

Browse source 
Fix `inferred_kind` ICE

Fixes #103790
This commit is contained in:
Matthias Krüger 2022-11-02 22:06:27 +01:00 • committed by GitHub
commit 5784a038fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_hir_analysis/src/astconv/mod.rs
View file

@ -500,6 +500,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
}
GenericParamDefKind::Const { has_default } => {
let ty = tcx.at(self.span).type_of(param.def_id);
if ty.references_error() {
return tcx.const_error(ty).into();
}
if !infer_args && has_default {
tcx.bound_const_param_default(param.def_id)
.subst(tcx, substs.unwrap())

10
src/test/ui/consts/issue-103790.rs Normal file
View file

@ -0,0 +1,10 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]
struct S<const S: (), const S: S = { S }>;
//~^ ERROR the name `S` is already used for a generic parameter in this item's generic parameters
//~| ERROR missing generics for struct `S`
//~| ERROR cycle detected when computing type of `S::S`
//~| ERROR cycle detected when computing type of `S`
fn main() {}

65
src/test/ui/consts/issue-103790.stderr Normal file
View file

@ -0,0 +1,65 @@
error[E0403]: the name `S` is already used for a generic parameter in this item's generic parameters
--> $DIR/issue-103790.rs:4:29
|
LL | struct S<const S: (), const S: S = { S }>;
| - ^ already used
| |
| first use of `S`
error[E0107]: missing generics for struct `S`
--> $DIR/issue-103790.rs:4:32
|
LL | struct S<const S: (), const S: S = { S }>;
| ^ expected at least 1 generic argument
|
note: struct defined here, with at least 1 generic parameter: `S`
--> $DIR/issue-103790.rs:4:8
|
LL | struct S<const S: (), const S: S = { S }>;
| ^ -----------
help: add missing generic argument
|
LL | struct S<const S: (), const S: S<S> = { S }>;
| ~~~~
error[E0391]: cycle detected when computing type of `S::S`
--> $DIR/issue-103790.rs:4:32
|
LL | struct S<const S: (), const S: S = { S }>;
| ^
|
= note: ...which immediately requires computing type of `S::S` again
note: cycle used when computing type of `S`
--> $DIR/issue-103790.rs:4:1
|
LL | struct S<const S: (), const S: S = { S }>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0391]: cycle detected when computing type of `S`
--> $DIR/issue-103790.rs:4:1
|
LL | struct S<const S: (), const S: S = { S }>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: ...which requires computing type of `S::S`...
--> $DIR/issue-103790.rs:4:32
|
LL | struct S<const S: (), const S: S = { S }>;
| ^
= note: ...which again requires computing type of `S`, completing the cycle
note: cycle used when collecting item types in top-level module
--> $DIR/issue-103790.rs:1:1
|
LL | / #![feature(generic_const_exprs)]
LL | | #![allow(incomplete_features)]
LL | |
LL | | struct S<const S: (), const S: S = { S }>;
... |
LL | |
LL | | fn main() {}
| |____________^
error: aborting due to 4 previous errors
Some errors have detailed explanations: E0107, E0391, E0403.
For more information about an error, try `rustc --explain E0107`.