Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#62240 - arielb1:resolve-wf-fields, r=pnkfelix
Browse files Browse the repository at this point in the history
wfcheck: resolve the type-vars in `AdtField` types

Normalization can leave some type-vars unresolved in its return type.
Make sure to resolve them so we have an infcx-independent type that can
be used with `needs_drop`.

Fixes rust-lang#61402.

Closes rust-lang#62212 - this PR fixes the root cause.
Centril authored Jul 3, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents bfd789f + a02d436 commit da75e72
Showing 2 changed files with 23 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/librustc_typeck/check/wfcheck.rs
Original file line number Diff line number Diff line change
@@ -1104,6 +1104,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let field_ty = self.tcx.type_of(self.tcx.hir().local_def_id_from_hir_id(field.hir_id));
let field_ty = self.normalize_associated_types_in(field.span,
&field_ty);
let field_ty = self.resolve_vars_if_possible(&field_ty);
debug!("non_enum_variant: type of field {:?} is {:?}", field, field_ty);
AdtField { ty: field_ty, span: field.span }
})
.collect();
21 changes: 21 additions & 0 deletions src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// If a struct is packed and its last field has drop glue, then that
// field needs to be Sized (to allow it to be destroyed out-of-place).
//
// This is checked by the compiler during wfcheck. That check used
// to have problems with associated types in the last field - test
// that this doesn't ICE.

#![allow(unused_imports, dead_code)]

pub struct S;

pub trait Trait<R> { type Assoc; }

impl<X> Trait<X> for S { type Assoc = X; }

#[repr(C, packed)]
struct PackedAssocSized {
pos: Box<<S as Trait<usize>>::Assoc>,
}

fn main() { println!("Hello, world!"); }

0 comments on commit da75e72

Please sign in to comment.