Skip to content

Commit

Permalink
Rollup merge of rust-lang#81716 - m-ou-se:fix-ice, r=eddyb
Browse files Browse the repository at this point in the history
Fix non-existent-field ICE for generic fields.

I mentioned this ICE in a chat and it took about 3 milliseconds before `@eddyb` found the problem and said this change would fix it. :)

This also changes one the field types in the related test to one that triggered the ICE.

Fixes rust-lang#81627.
Fixes rust-lang#81672.
Fixes rust-lang#81709.

Cc rust-lang#81480 `@b-naber` `@estebank.`
  • Loading branch information
m-ou-se authored Feb 3, 2021
2 parents 65b3c0c + 68cc12a commit 4617418
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/check/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

field_path.push(candidate_field.ident.normalize_to_macros_2_0());
let field_ty = candidate_field.ty(self.tcx, subst);
if let Some((nested_fields, _)) = self.get_field_candidates(span, &field_ty) {
if let Some((nested_fields, subst)) = self.get_field_candidates(span, &field_ty) {
for field in nested_fields.iter() {
let ident = field.ident.normalize_to_macros_2_0();
if ident == target_field {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
struct Foo {
first: Bar,
_second: u32,
_third: u32,
_third: Vec<String>,
}

struct Bar {
Expand Down Expand Up @@ -32,7 +32,7 @@ fn main() {
let d = D { test: e };
let c = C { c: d };
let bar = Bar { bar: c };
let fooer = Foo { first: bar, _second: 4, _third: 5 };
let fooer = Foo { first: bar, _second: 4, _third: Vec::new() };

let _test = &fooer.first.bar.c;
//~^ ERROR no field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
struct Foo {
first: Bar,
_second: u32,
_third: u32,
_third: Vec<String>,
}

struct Bar {
Expand Down Expand Up @@ -32,7 +32,7 @@ fn main() {
let d = D { test: e };
let c = C { c: d };
let bar = Bar { bar: c };
let fooer = Foo { first: bar, _second: 4, _third: 5 };
let fooer = Foo { first: bar, _second: 4, _third: Vec::new() };

let _test = &fooer.c;
//~^ ERROR no field
Expand Down

0 comments on commit 4617418

Please sign in to comment.