From 2b06118d5f2d0abbec873b4310c40b3e1006d74e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 6 May 2025 21:50:38 -0600 Subject: [PATCH] Fix deadlock when logging scopes --- src/ld_so/linker.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ld_so/linker.rs b/src/ld_so/linker.rs index 0f9c5c2f6b..1e945bf42a 100644 --- a/src/ld_so/linker.rs +++ b/src/ld_so/linker.rs @@ -462,8 +462,10 @@ impl Linker { eprintln!("[ld.so]: moving {} into the global scope", obj.name); } - let mut global_scope = GLOBAL_SCOPE.write(); - obj.scope().copy_into(&mut global_scope); + { + let mut global_scope = GLOBAL_SCOPE.write(); + obj.scope().copy_into(&mut global_scope); + } self.scope_debug(); }