diff options
| author | Taylor Cramer <cramertaylorj@gmail.com> | 2017-03-21 01:26:27 -0700 |
|---|---|---|
| committer | Ben Striegel <ben.striegel@gmail.com> | 2017-03-21 16:29:38 -0400 |
| commit | a212002db1d9c7ea4d0c21058a96631a52ba7b81 (patch) | |
| tree | 7674facb906fcd0d932c5bbb3e6f61fe7f5089c3 /src | |
| parent | 58c701f5c7dc26d9b55c631006ece52abe1ddce2 (diff) | |
| download | rust-a212002db1d9c7ea4d0c21058a96631a52ba7b81.tar.gz rust-a212002db1d9c7ea4d0c21058a96631a52ba7b81.zip | |
Remove unused adt-def insertion by constructor DefIndex
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index b4b9966cbe4..ba6d552e134 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -558,7 +558,6 @@ impl<'a, 'tcx> CrateMetadata { EntryKind::Union(_, _) => ty::AdtKind::Union, _ => bug!("get_adt_def called on a non-ADT {:?}", did), }; - let mut ctor_index = None; let variants = if let ty::AdtKind::Enum = kind { item.children .decode(self) @@ -570,8 +569,7 @@ impl<'a, 'tcx> CrateMetadata { }) .collect() } else { - let (variant, struct_ctor) = self.get_variant(&item, item_id, tcx); - ctor_index = struct_ctor; + let (variant, _struct_ctor) = self.get_variant(&item, item_id, tcx); vec![variant] }; let (kind, repr) = match item.kind { @@ -581,13 +579,7 @@ impl<'a, 'tcx> CrateMetadata { _ => bug!("get_adt_def called on a non-ADT {:?}", did), }; - let adt = tcx.alloc_adt_def(did, kind, variants, repr); - if let Some(ctor_index) = ctor_index { - // Make adt definition available through constructor id as well. - tcx.maps.adt_def.borrow_mut().insert(self.local_def_id(ctor_index), adt); - } - - adt + tcx.alloc_adt_def(did, kind, variants, repr) } pub fn get_predicates(&self, |