Merge pull request #33 from iMplode-nZ/main

Fix `Shared` double-entering mutex and causing crash.
LuisaGroup · Mar 15, 2024 · 92cfa27 · 92cfa27
2 parents 6838dc5 + 51d1ff8
commit 92cfa27
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/luisa_compute/src/lang/types/shared.rs b/luisa_compute/src/lang/types/shared.rs
@@ -9,24 +9,25 @@ pub struct Shared<T: Value> {
 }
 impl<T: Value> Shared<T> {
     pub fn new(length: usize) -> Self {
+        let shared = with_recorder(|r| {
+            let shared = new_node(
+                &r.pools,
+                Node::new(
+                    CArc::new(Instruction::Shared),
+                    ir::context::register_type(Type::Array(ArrayType {
+                        element: T::type_(),
+                        length,
+                    })),
+                ),
+            )
+            .into();
+
+            r.shared.push(shared);
+            shared
+        });
         Self {
             marker: PhantomData,
-            node: with_recorder(|r| {
-                let shared = new_node(
-                    &r.pools,
-                    Node::new(
-                        CArc::new(Instruction::Shared),
-                        ir::context::register_type(Type::Array(ArrayType {
-                            element: T::type_(),
-                            length,
-                        })),
-                    ),
-                )
-                .into();
-
-                r.shared.push(shared);
-                shared.into()
-            }),
+            node: shared.into(),
         }
     }
     pub fn len_expr(&self) -> Expr<u64> {