Skip to content

Commit e05b8c6

Browse files
committed
WIP -- librustc_trans -- Fix merge conflict and remove a use of ignore while we're at it
1 parent 5668191 commit e05b8c6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/librustc/dep_graph/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ pub enum DepNode {
6565
TransLinkMeta,
6666
TransCrateItem(DefId),
6767
TransInlinedItem(DefId),
68+
TransWriteMetadata,
6869

6970
// Nodes representing bits of computed IR in the tcx. Each of
7071
// these corresponds to a particular table in the tcx.

src/librustc_trans/trans/base.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -3060,8 +3060,9 @@ pub fn trans_crate<'tcx>(tcx: &ty::ctxt<'tcx>,
30603060
let reachable_symbol_ids = filter_reachable_ids(&shared_ccx);
30613061

30623062
// Translate the metadata.
3063-
let metadata = tcx.dep_graph.with_ignore(|| {
3064-
write_metadata(&shared_ccx, krate, &reachable_symbol_ids, mir_map);
3063+
let metadata = tcx.dep_graph.with_task(DepNode::TransWriteMetadata, || {
3064+
let krate = tcx.map.krate();
3065+
write_metadata(&shared_ccx, krate, &reachable_symbol_ids, mir_map)
30653066
});
30663067

30673068
if shared_ccx.sess().trans_stats() {

0 commit comments

Comments
 (0)