From a211a82b3c7e450edd99ff6d3cf77a0cedae0d2e Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Mon, 24 Feb 2020 23:22:46 +0900
Subject: [PATCH] Address review comment

---
 src/librustc_save_analysis/lib.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
index a46be2dcd82d5..22df31cc526d6 100644
--- a/src/librustc_save_analysis/lib.rs
+++ b/src/librustc_save_analysis/lib.rs
@@ -533,17 +533,17 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                 match self.tables.expr_ty_adjusted(&hir_node).kind {
                     ty::Adt(def, _) if !def.is_enum() => {
                         let variant = &def.non_enum_variant();
-                        if let Some(index) = self.tcx.find_field_index(ident, variant) {
-                            filter!(self.span_utils, ident.span);
-                            let span = self.span_from_span(ident.span);
-                            return Some(Data::RefData(Ref {
-                                kind: RefKind::Variable,
-                                span,
-                                ref_id: id_from_def_id(variant.fields[index].did),
-                            }));
-                        }
-
-                        None
+                        filter!(self.span_utils, ident.span);
+                        let span = self.span_from_span(ident.span);
+                        return Some(Data::RefData(Ref {
+                            kind: RefKind::Variable,
+                            span,
+                            ref_id: self
+                                .tcx
+                                .find_field_index(ident, variant)
+                                .map(|index| id_from_def_id(variant.fields[index].did))
+                                .unwrap_or_else(|| null_id()),
+                        }));
                     }
                     ty::Tuple(..) => None,
                     _ => {