Use ItemLocalId as key for TypeckTables::fru_field_types.

[rust.git] / src / librustc_mir / hair / cx / expr.rs

diff --git a/src/librustc_mir/hair/cx/expr.rs b/src/librustc_mir/hair/cx/expr.rs
index ea9a19c837824790a2e8f66fa0238cee133ac47b..30f7378e83b1ee54cfc0c0b7a79793d63bed27fe 100644 (file)
--- a/src/librustc_mir/hair/cx/expr.rs
+++ b/src/librustc_mir/hair/cx/expr.rs
@@ -387,9 +387,12 @@ fn make_mirror_unadjusted<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
                                 substs: substs,
                                 fields: field_refs,
                                 base: base.as_ref().map(|base| {
+                                    cx.tables().validate_hir_id(expr.hir_id);
                                     FruInfo {
                                         base: base.to_ref(),
-                                        field_types: cx.tables().fru_field_types[&expr.id].clone(),
+                                        field_types: cx.tables()
+                                                       .fru_field_types[&expr.hir_id.local_id]
+                                                       .clone(),
                                     }
                                 }),
                             }