Skip to content

Commit 2ddd981

Browse files
committed
refactor Lock
1 parent c1d3610 commit 2ddd981

File tree

6 files changed

+328
-72
lines changed

6 files changed

+328
-72
lines changed

compiler/rustc_codegen_ssa/src/base.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ use rustc_ast::expand::allocator::AllocatorKind;
1717
use rustc_attr as attr;
1818
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1919
use rustc_data_structures::profiling::{get_resident_set_size, print_time_passes_entry};
20-
21-
use rustc_data_structures::sync::par_iter;
22-
#[cfg(parallel_compiler)]
23-
use rustc_data_structures::sync::ParallelIterator;
20+
use rustc_data_structures::sync::par_map;
2421
use rustc_hir as hir;
2522
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
2623
use rustc_hir::lang_items::LangItem;
@@ -702,12 +699,10 @@ pub fn codegen_crate<B: ExtraBackendMethods>(
702699
// Compile the found CGUs in parallel.
703700
let start_time = Instant::now();
704701

705-
let pre_compiled_cgus = par_iter(cgus)
706-
.map(|(i, _)| {
707-
let module = backend.compile_codegen_unit(tcx, codegen_units[i].name());
708-
(i, module)
709-
})
710-
.collect();
702+
let pre_compiled_cgus = par_map(cgus, |(i, _)| {
703+
let module = backend.compile_codegen_unit(tcx, codegen_units[i].name());
704+
(i, module)
705+
});
711706

712707
total_codegen_time += start_time.elapsed();
713708

compiler/rustc_data_structures/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
#![feature(thread_id_value)]
2828
#![feature(vec_into_raw_parts)]
2929
#![feature(get_mut_unchecked)]
30+
#![feature(mutex_unpoison)]
31+
#![feature(sync_unsafe_cell)]
32+
#![feature(const_trait_impl)]
33+
#![feature(const_mut_refs)]
3034
#![allow(rustc::default_hash_types)]
3135
#![allow(rustc::potential_query_instability)]
3236
#![deny(rustc::untranslatable_diagnostic)]

0 commit comments

Comments
 (0)