field path lowering, do check the field's type if the kind is OffsetOf

Author: BennoLossin

compiler/rustc_hir_analysis/src/collect.rs

@@ -410,7 +410,7 @@ impl<'tcx> HirTyLowerer<'tcx> for ItemCtxt<'tcx> {
                         }
 
                         field_indices.push((FIRST_VARIANT, index));
-                        if !last {
+                        if field_path_kind == FieldPathKind::OffsetOf || !last {
                             let field_ty = field.ty(self.tcx, args);
                             current_container = field_ty;
                         }

compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs

@@ -362,7 +362,7 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
                         self.private_field_err(ident, container_def.did()).emit();
                     }
 
-                    if !last {
+                    if field_path_kind == FieldPathKind::OffsetOf || !last {
                         let field_ty = self.field_ty(span, field, args);
 
                         // Enums are anyway always sized. But just to safeguard against future
@@ -402,7 +402,7 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
                             self.private_field_err(ident, container_def.did()).emit();
                         }
 
-                        if !last {
+                        if field_path_kind == FieldPathKind::OffsetOf || !last {
                             let field_ty = self.field_ty(span, field, args);
 
                             match field_path_kind {