Skip to content

Commit

Permalink
Unrolled build for rust-lang#124394
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#124394 - gurry:123863-ice-unexpected-region, r=lcnr

Fix ICE on invalid const param types

Fixes ICE rust-lang#123863 which occurs because the const param has a type which is not a `bool`, `char` or an integral type.

The ICEing code path begins here in `typeck_with_fallback`: https://github.com/rust-lang/rust/blob/cb3752d20e0f5d24348062211102a08d46fbecff/compiler/rustc_hir_typeck/src/lib.rs#L167

The `fallback` invokes the `type_of` query and that eventually ends up calling `ct_infer` from the lowering code over here:
https://github.com/rust-lang/rust/blob/cb3752d20e0f5d24348062211102a08d46fbecff/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs#L561 and `ct_infer` ICEs at this location: https://github.com/rust-lang/rust/blob/cb3752d20e0f5d24348062211102a08d46fbecff/compiler/rustc_hir_analysis/src/collect.rs#L392

To fix the ICE it I'm triggering a `span_delayed_bug` before we hit `ct_infer` if the type of the const param is not one of the supported types

### Edit
On `@lcnr's` suggestion I've changed the approach to not let `ReStatic` region hit the `bug!` in `ct_infer` instead of triggering a `span_delayed_bug`.
  • Loading branch information
rust-timer authored Apr 27, 2024
2 parents 825e831 + c62bc31 commit 3140d7f
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 6 deletions.
2 changes: 2 additions & 0 deletions compiler/rustc_hir_analysis/src/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {

fn ct_infer(&self, ty: Ty<'tcx>, _: Option<&ty::GenericParamDef>, span: Span) -> Const<'tcx> {
let ty = self.tcx.fold_regions(ty, |r, _| match *r {
rustc_type_ir::RegionKind::ReStatic => r,

// This is never reached in practice. If it ever is reached,
// `ReErased` should be changed to `ReStatic`, and any other region
// left alone.
Expand Down
6 changes: 0 additions & 6 deletions tests/crashes/123863.rs

This file was deleted.

9 changes: 9 additions & 0 deletions tests/ui/typeck/ice-unexpected-region-123863.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const fn concat_strs<const A: &'static str>() -> &'static str {
//~^ ERROR &'static str` is forbidden as the type of a const generic parameter
struct Inner<const A: &'static str>;
//~^ ERROR &'static str` is forbidden as the type of a const generic parameter
Inner::concat_strs::<"a">::A
//~^ ERROR ambiguous associated type
}

pub fn main() {}
38 changes: 38 additions & 0 deletions tests/ui/typeck/ice-unexpected-region-123863.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
error: `&'static str` is forbidden as the type of a const generic parameter
--> $DIR/ice-unexpected-region-123863.rs:1:31
|
LL | const fn concat_strs<const A: &'static str>() -> &'static str {
| ^^^^^^^^^^^^
|
= note: the only supported types are integers, `bool` and `char`
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
|
LL + #![feature(adt_const_params)]
|

error: `&'static str` is forbidden as the type of a const generic parameter
--> $DIR/ice-unexpected-region-123863.rs:3:27
|
LL | struct Inner<const A: &'static str>;
| ^^^^^^^^^^^^
|
= note: the only supported types are integers, `bool` and `char`
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
|
LL + #![feature(adt_const_params)]
|

error[E0223]: ambiguous associated type
--> $DIR/ice-unexpected-region-123863.rs:5:5
|
LL | Inner::concat_strs::<"a">::A
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: if there were a trait named `Example` with associated type `concat_strs` implemented for `Inner<_>`, you could use the fully-qualified path
|
LL | <Inner<_> as Example>::concat_strs::A
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0223`.

0 comments on commit 3140d7f

Please sign in to comment.