OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #30779 - michaelwoerister:closure-mir-in-metadata, r=nikomatsakis

Browse Source
This commit is contained in:
bors 2016-01-13 15:08:07 +00:00
commit 7aed245d69
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustc_metadata/encoder.rs
View File

@ -806,18 +806,18 @@ fn encode_inlined_item(ecx: &EncodeContext,
let eii: &mut EncodeInlinedItem = &mut *eii;
eii(ecx, rbml_w, ii);
encode_mir(ecx, rbml_w, ii);
}
fn encode_mir(ecx: &EncodeContext, rbml_w: &mut Encoder, ii: InlinedItemRef) {
let id = match ii {
let node_id = match ii {
InlinedItemRef::Item(item) => item.id,
InlinedItemRef::TraitItem(_, trait_item) => trait_item.id,
InlinedItemRef::ImplItem(_, impl_item) => impl_item.id,
InlinedItemRef::Foreign(foreign_item) => foreign_item.id
};
if let Some(mir) = ecx.mir_map.get(&id) {
encode_mir(ecx, rbml_w, node_id);
}
fn encode_mir(ecx: &EncodeContext, rbml_w: &mut Encoder, node_id: NodeId) {
if let Some(mir) = ecx.mir_map.get(&node_id) {
rbml_w.start_tag(tag_mir as usize);
rbml_w.emit_opaque(|opaque_encoder| {
tls::enter_encoding_context(ecx, opaque_encoder, |_, opaque_encoder| {
@ -1436,6 +1436,9 @@ fn my_visit_expr(expr: &hir::Expr,
ecx.tcx.map.with_path(expr.id, |path| encode_path(rbml_w, path));
assert!(ecx.mir_map.contains_key(&expr.id));
encode_mir(ecx, rbml_w, expr.id);
rbml_w.end_tag();
}
_ => { }