bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix ICE in improper_ctypes_definitions lint

Browse source 
The lint panicked for an input like 'extern "C" fn(Option<&<T as FooTrait>::FooType>)' because the type T therein cannot be normalized. The normalization failure caused SizeSkeleton::compute() to return an error and trigger a panic in the unwrap().
This commit is contained in:
Gurinder Singh 2023-09-09 12:30:25 +05:30
parent 5ede940894
commit e7c51320db
3 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_lint/src/types.rs
View file

@ -917,8 +917,8 @@ pub(crate) fn repr_nullable_ptr<'tcx>(
// At this point, the field's type is known to be nonnull and the parent enum is Option-like.
// If the computed size for the field and the enum are different, the nonnull optimization isn't
// being applied (and we've got a problem somewhere).
let compute_size_skeleton = |t| SizeSkeleton::compute(t, tcx, param_env).unwrap();
if !compute_size_skeleton(ty).same_size(compute_size_skeleton(field_ty)) {
let compute_size_skeleton = |t| SizeSkeleton::compute(t, tcx, param_env).ok();
if !compute_size_skeleton(ty)?.same_size(compute_size_skeleton(field_ty)?) {
bug!("improper_ctypes: Option nonnull optimization not applied?");
}