"scopeguard",
]
-[[package]]
-name = "crossbeam-queue"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-dependencies = [
- "crossbeam-utils 0.6.6",
-]
-
[[package]]
name = "crossbeam-queue"
version = "0.2.3"
"maybe-uninit",
]
-[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-dependencies = [
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
[[package]]
name = "crossbeam-utils"
version = "0.7.2"
checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
dependencies = [
"crossbeam-deque",
- "crossbeam-queue 0.2.3",
+ "crossbeam-queue",
"crossbeam-utils 0.7.2",
"lazy_static",
"num_cpus",
[[package]]
name = "rustc-rayon"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a"
+checksum = "ed7d6a39f8bfd4421ce720918234d1e672b83824c91345b47c93746839cf1629"
dependencies = [
"crossbeam-deque",
"either",
[[package]]
name = "rustc-rayon-core"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3"
+checksum = "e94187d9ea3e8c38fafdbc38acb94eafa7ce155867f6ccb13830466a0d0db8c6"
dependencies = [
"crossbeam-deque",
- "crossbeam-queue 0.1.2",
- "crossbeam-utils 0.6.6",
+ "crossbeam-queue",
+ "crossbeam-utils 0.7.2",
"lazy_static",
"num_cpus",
]
name = "rustc_arena"
version = "0.0.0"
dependencies = [
+ "rustc_data_structures",
"smallvec 1.6.1",
]
edition = "2018"
[dependencies]
+rustc_data_structures = { path = "../rustc_data_structures" }
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
#![feature(min_specialization)]
#![cfg_attr(test, feature(test))]
+use rustc_data_structures::sync;
use smallvec::SmallVec;
use std::alloc::Layout;
obj: *mut u8,
}
-unsafe fn drop_for_type<T>(to_drop: *mut u8) {
- std::ptr::drop_in_place(to_drop as *mut T)
+// SAFETY: we require `T: Send` before type-erasing into `DropType`.
+#[cfg(parallel_compiler)]
+unsafe impl sync::Send for DropType {}
+
+impl DropType {
+ #[inline]
+ unsafe fn new<T: sync::Send>(obj: *mut T) -> Self {
+ unsafe fn drop_for_type<T>(to_drop: *mut u8) {
+ std::ptr::drop_in_place(to_drop as *mut T)
+ }
+
+ DropType { drop_fn: drop_for_type::<T>, obj: obj as *mut u8 }
+ }
}
impl Drop for DropType {
impl DropArena {
#[inline]
- pub unsafe fn alloc<T>(&self, object: T) -> &mut T {
+ pub unsafe fn alloc<T>(&self, object: T) -> &mut T
+ where
+ T: sync::Send,
+ {
let mem = self.arena.alloc_raw(Layout::new::<T>()) as *mut T;
// Write into uninitialized memory.
ptr::write(mem, object);
let result = &mut *mem;
// Record the destructor after doing the allocation as that may panic
// and would cause `object`'s destructor to run twice if it was recorded before.
- self.destructors
- .borrow_mut()
- .push(DropType { drop_fn: drop_for_type::<T>, obj: result as *mut T as *mut u8 });
+ self.destructors.borrow_mut().push(DropType::new(result));
result
}
#[inline]
- pub unsafe fn alloc_from_iter<T, I: IntoIterator<Item = T>>(&self, iter: I) -> &mut [T] {
+ pub unsafe fn alloc_from_iter<T, I>(&self, iter: I) -> &mut [T]
+ where
+ T: sync::Send,
+ I: IntoIterator<Item = T>,
+ {
let mut vec: SmallVec<[_; 8]> = iter.into_iter().collect();
if vec.is_empty() {
return &mut [];
// Record the destructors after doing the allocation as that may panic
// and would cause `object`'s destructor to run twice if it was recorded before.
for i in 0..len {
- destructors
- .push(DropType { drop_fn: drop_for_type::<T>, obj: start_ptr.add(i) as *mut u8 });
+ destructors.push(DropType::new(start_ptr.add(i)));
}
slice::from_raw_parts_mut(start_ptr, len)
cfg-if = "0.1.2"
crossbeam-utils = { version = "0.7", features = ["nightly"] }
stable_deref_trait = "1.0.0"
-rayon = { version = "0.3.0", package = "rustc-rayon" }
-rayon-core = { version = "0.3.0", package = "rustc-rayon-core" }
+rayon = { version = "0.3.1", package = "rustc-rayon" }
+rayon-core = { version = "0.3.1", package = "rustc-rayon-core" }
rustc-hash = "1.1.0"
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
rustc_index = { path = "../rustc_index", package = "rustc_index" }
[dependencies]
libc = "0.2"
tracing = "0.1"
-rustc-rayon-core = "0.3.0"
-rayon = { version = "0.3.0", package = "rustc-rayon" }
+rustc-rayon-core = "0.3.1"
+rayon = { version = "0.3.1", package = "rustc-rayon" }
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" }
rustc_arena = { path = "../rustc_arena" }
bitflags = "1.2.1"
tracing = "0.1"
-rustc-rayon-core = "0.3.0"
+rustc-rayon-core = "0.3.1"
polonius-engine = "0.12.0"
rustc_apfloat = { path = "../rustc_apfloat" }
rustc_attr = { path = "../rustc_attr" }
[dependencies]
measureme = "9.0.0"
-rustc-rayon-core = "0.3.0"
+rustc-rayon-core = "0.3.1"
tracing = "0.1"
rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" }
[dependencies]
rustc_arena = { path = "../rustc_arena" }
tracing = "0.1"
-rustc-rayon-core = "0.3.0"
+rustc-rayon-core = "0.3.1"
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
rustc_macros = { path = "../rustc_macros" }