From efd85236fcc7e69c099611afc58271ffc57017ec Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Tue, 28 Jul 2026 17:41:11 +0300 Subject: [PATCH] Fix recursion limits with next solver (cherry picked from v30 commit 73a7e979816884214e229f65c6153db04b693c75) --- wgpu-core/src/global.rs | 49 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/wgpu-core/src/global.rs b/wgpu-core/src/global.rs index 4587e8b7a..c967d4631 100644 --- a/wgpu-core/src/global.rs +++ b/wgpu-core/src/global.rs @@ -84,6 +84,49 @@ impl Global { } } +/// Implement [`Send`] + [`Sync`] for [`Global`], and check that all of its fields are. +/// +/// This is identical to the “auto trait” implementation that Rust would provide, except that +/// it is eager rather than lazy: its requirements are checked now (in +/// `_global_fields_are_send_sync`), when this crate is compiled, rather than whenever a dependent +/// wants to know whether `Global: Send` holds. +/// +/// This improves compilation performance and avoids a risk of dependents running into the default +/// [`recursion_limit`] when checking types containing [`Global`]. This risk will become greater +/// when Rust’s “next solver” is stabilized. +/// +/// [`recursion_limit`]: https://doc.rust-lang.org/reference/attributes/limits.html#the-recursion_limit-attribute +#[cfg(send_sync)] +mod global_send_sync { + use super::Global; + + // SAFETY: Bounds checked below + unsafe impl Send for Global {} + + // SAFETY: Bounds checked below + unsafe impl Sync for Global {} + + /// This function will fail to compile if any field is not `Send + Sync`, or if a new field is + /// added to `Global`. + /// + /// This technique is modeled after the macro library `non_structural_derive`, with permission + /// (see + /// ). + /// We only need it once, so it’s cheaper to write out the same code the macro would generate. + fn _global_fields_are_send_sync(global: &Global) { + fn _check_bound(_: &T) {} + + let Global { + surfaces, + hub, + instance, + } = global; + _check_bound(surfaces); + _check_bound(hub); + _check_bound(instance); + } +} + impl fmt::Debug for Global { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Global").finish() @@ -96,9 +139,3 @@ impl Drop for Global { resource_log!("Global::drop"); } } - -#[cfg(send_sync)] -fn _test_send_sync(global: &Global) { - fn test_internal(_: T) {} - test_internal(global) -}