diff --git a/boa_engine/src/lib.rs b/boa_engine/src/lib.rs index a0e0b483837..6a3d6bcbded 100644 --- a/boa_engine/src/lib.rs +++ b/boa_engine/src/lib.rs @@ -123,9 +123,11 @@ // Add temporarily - Needs addressing clippy::missing_panics_doc, - clippy::arc_with_non_send_sync, )] +#[cfg(not(target_has_atomic = "ptr"))] +compile_error!("Boa requires a lock free `AtomicUsize` in order to work properly."); + extern crate static_assertions as sa; pub mod bigint; diff --git a/boa_engine/src/symbol.rs b/boa_engine/src/symbol.rs index cd087d31ed0..c7e33f9b44e 100644 --- a/boa_engine/src/symbol.rs +++ b/boa_engine/src/symbol.rs @@ -33,16 +33,15 @@ use num_enum::{IntoPrimitive, TryFromPrimitive}; use std::{ hash::{Hash, Hasher}, - sync::{ - atomic::{AtomicU64, Ordering}, - Arc, - }, + sync::{atomic::Ordering, Arc}, }; +use portable_atomic::AtomicU64; + /// Reserved number of symbols. /// -/// This is where the well known symbol live -/// and internal engine symbols. +/// This is the maximum number of well known and internal engine symbols +/// that can be defined. const RESERVED_SYMBOL_HASHES: u64 = 127; fn get_id() -> Option { @@ -118,21 +117,17 @@ impl WellKnown { self as u64 } - const fn tag(self) -> usize { - self as usize - } - fn from_tag(tag: usize) -> Option { Self::try_from_primitive(u8::try_from(tag).ok()?).ok() } } -// TODO: Address below clippy::arc_with_non_send_sync below. /// The inner representation of a JavaScript symbol. #[derive(Debug, Clone)] struct Inner { hash: u64, - description: Option, + // must be a `Box`, since this needs to be shareable between many threads. + description: Option>, } /// This represents a JavaScript symbol primitive. @@ -158,7 +153,8 @@ macro_rules! well_known_symbols { $( $(#[$attr])* pub(crate) const fn $name() -> JsSymbol { JsSymbol { - repr: Tagged::from_tag($variant.tag()), + // the cast shouldn't matter since we only have 127 const symbols + repr: Tagged::from_tag($variant.hash() as usize), } } )+ @@ -173,7 +169,10 @@ impl JsSymbol { #[must_use] pub fn new(description: Option) -> Option { let hash = get_id()?; - let arc = Arc::new(Inner { hash, description }); + let arc = Arc::new(Inner { + hash, + description: description.map(|s| Box::from(&*s)), + }); Some(Self { // SAFETY: Pointers returned by `Arc::into_raw` must be non-null. @@ -188,8 +187,8 @@ impl JsSymbol { match self.repr.unwrap() { UnwrappedTagged::Ptr(ptr) => { // SAFETY: `ptr` comes from `Arc`, which ensures the validity of the pointer - // as long as we corrently call `Arc::from_raw` on `Drop`. - unsafe { ptr.as_ref().description.clone() } + // as long as we correctly call `Arc::from_raw` on `Drop`. + unsafe { ptr.as_ref().description.as_ref().map(|v| js_string!(&**v)) } } UnwrappedTagged::Tag(tag) => { // SAFETY: All tagged reprs always come from `WellKnown` itself, making diff --git a/boa_gc/src/trace.rs b/boa_gc/src/trace.rs index ba5704bed74..070a93ffc58 100644 --- a/boa_gc/src/trace.rs +++ b/boa_gc/src/trace.rs @@ -11,10 +11,7 @@ use std::{ }, path::{Path, PathBuf}, rc::Rc, - sync::atomic::{ - AtomicBool, AtomicI16, AtomicI32, AtomicI64, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, - AtomicU64, AtomicU8, AtomicUsize, - }, + sync::atomic, }; /// Substitute for the [`Drop`] trait for garbage collected types. @@ -161,20 +158,24 @@ simple_empty_finalize_trace![ NonZeroI64, NonZeroU64, NonZeroI128, - NonZeroU128, - AtomicBool, - AtomicIsize, - AtomicUsize, - AtomicI8, - AtomicU8, - AtomicI16, - AtomicU16, - AtomicI32, - AtomicU32, - AtomicI64, - AtomicU64 + NonZeroU128 ]; +#[cfg(target_has_atomic = "8")] +simple_empty_finalize_trace![atomic::AtomicBool, atomic::AtomicI8, atomic::AtomicU8]; + +#[cfg(target_has_atomic = "16")] +simple_empty_finalize_trace![atomic::AtomicI16, atomic::AtomicU16]; + +#[cfg(target_has_atomic = "32")] +simple_empty_finalize_trace![atomic::AtomicI32, atomic::AtomicU32]; + +#[cfg(target_has_atomic = "64")] +simple_empty_finalize_trace![atomic::AtomicI64, atomic::AtomicU64]; + +#[cfg(target_has_atomic = "ptr")] +simple_empty_finalize_trace![atomic::AtomicIsize, atomic::AtomicUsize]; + impl Finalize for [T; N] {} // SAFETY: // All elements inside the array are correctly marked.