mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always encode variant fields

Browse Source 
we need them to be able to retrace.
This commit is contained in:
Niko Matsakis 2016-04-22 15:18:02 -04:00
parent c7840cfe14
commit 8f3a8c24cd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_metadata/decoder.rs
View File

@ -71,7 +71,10 @@ fn get_item(&self, item_id: DefIndex) -> Option<rbml::Doc> {
fn lookup_item(&self, item_id: DefIndex) -> rbml::Doc {
match self.get_item(item_id) {
None => bug!("lookup_item: id not found: {:?}", item_id),
None => bug!("lookup_item: id not found: {:?} in crate {:?} with number {}",
item_id,
self.name,
self.cnum),
Some(d) => d
}
}

9
src/librustc_metadata/encoder.rs
View File

@ -267,12 +267,8 @@ fn encode_enum_variant_info<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
let vid = variant.did;
let variant_node_id = ecx.local_id(vid);
if let ty::VariantKind::Struct = variant.kind() {
// tuple-like enum variant fields aren't really items so
// don't try to encode them.
for field in &variant.fields {
encode_field(ecx, rbml_w, field, index);
}
for field in &variant.fields {
encode_field(ecx, rbml_w, field, index);
}
let _task = index.record(vid, rbml_w);
@ -306,6 +302,7 @@ fn encode_enum_variant_info<'a, 'tcx>(ecx: &EncodeContext<'a, 'tcx>,
encode_bounds_and_type_for_item(rbml_w, ecx, index, variant_node_id);
rbml_w.end_tag();
disr_val = disr_val.wrap_incr();
}
}