nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #124057 - gurry:124031-ice-layout-errored, r=compiler-errors

Browse Source 
Fix ICE when ADT tail has type error

Fixes #124031
This commit is contained in:
Matthias Krüger 2024-04-23 06:24:55 +02:00 committed by GitHub
commit 8859631b40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_middle/src/ty/layout.rs
View File

@ -338,6 +338,10 @@ impl<'tcx> SizeSkeleton<'tcx> {
debug_assert!(tail.has_non_region_param());
Ok(SizeSkeleton::Pointer { non_zero, tail: tcx.erase_regions(tail) })
}
ty::Error(guar) => {
// Fixes ICE #124031
return Err(tcx.arena.alloc(LayoutError::ReferencesError(*guar)));
}
_ => bug!(
"SizeSkeleton::compute({ty}): layout errored ({err:?}), yet \
tail `{tail}` is not a type parameter or a projection",

5
tests/crashes/124031.rs → tests/ui/layout/ice-type-error-in-tail-124031.rs
View File

@ -1,10 +1,13 @@
//@ known-bug: #124031
// Regression test for issue #124031
// Checks that we don't ICE when the tail
// of an ADT has a type error
trait Trait {
type RefTarget;
}
impl Trait for () {}
//~^ ERROR not all trait items implemented, missing: `RefTarget`
struct Other {
data: <() as Trait>::RefTarget,

12
tests/ui/layout/ice-type-error-in-tail-124031.stderr Normal file
View File

@ -0,0 +1,12 @@
error[E0046]: not all trait items implemented, missing: `RefTarget`
--> $DIR/ice-type-error-in-tail-124031.rs:9:1
|
LL | type RefTarget;
| -------------- `RefTarget` from trait
...
LL | impl Trait for () {}
| ^^^^^^^^^^^^^^^^^ missing `RefTarget` in implementation
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0046`.