fix:A closure invoked by iteration in a function call

Author: kevindadi

example/double_lock/src/main.rs

@@ -1,9 +1,18 @@
 use std::sync::{Arc, Mutex};
+use std::thread;
+
 fn main() {
     let mu1 = Arc::new(Mutex::new(1));
+    let mu2 = mu1.clone();
     //loop {
-    let g1 = mu1.lock();
-    let g2 = mu1.lock();
+    let g1 = mu1.lock().unwrap();
+
+    // let g2 = mu1.lock();
+
+    let th1 = thread::spawn(move || {
+        let mut g2 = mu2.lock().unwrap();
+        *g2 = 2;
+    });
 
-    println!("unreachable!");
+    th1.join().unwrap();
 }

example/rayon-deadlock/.gitignore

@@ -0,0 +1 @@
+/target

example/rayon-deadlock/Cargo.lock

@@ -0,0 +1,9 @@
+[package]
+name = "rayon-deadlock"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rayon = "1.0"

example/rayon-deadlock/Cargo.toml

@@ -0,0 +1,19 @@
+use rayon::prelude::*;
+use std::sync::{Arc, Mutex};
+
+fn main() {
+    let data = Arc::new(Mutex::new(0));
+
+    let lock = data.lock().unwrap();
+
+    rayon::join(
+        || {
+            let mut guard = data.lock().unwrap();
+            *guard += 1;
+        },
+        || {
+            let mut guard = data.lock().unwrap();
+            *guard += 1;
+        },
+    );
+}

example/rayon-deadlock/src/main.rs

@@ -1,2 +1,3 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2024-12-11"
+components = ["rustc-dev", "rust-src", "llvm-tools-preview"]

rust-toolchain.toml

@@ -29,6 +29,7 @@ pub enum CallSiteLocation {
         location: Location,
         destination: Local, // spawn 返回的 JoinHandle 存储位置
     },
+    RayonJoin,
 }
 
 impl CallSiteLocation {
@@ -288,7 +289,7 @@ impl<'a, 'tcx> Visitor<'tcx> for CallSiteCollector<'a, 'tcx> {
 
             if let ty::FnDef(def_id, substs) = *func_ty.kind() {
                 let fn_path = self.tcx.def_path_str(def_id);
-                if fn_path.contains("::spawn") {
+                if fn_path.contains("thread::spawn") {
                     // 获取第一个参数（闭包）
                     if let Some(closure_arg) = args.first() {
                         let closure_ty = match closure_arg.node {
@@ -320,6 +321,30 @@ impl<'a, 'tcx> Visitor<'tcx> for CallSiteCollector<'a, 'tcx> {
                     }
                 }
 
+                if fn_path.contains("rayon_core::join") {
+                    for arg in args {
+                        if let Operand::Move(place) | Operand::Copy(place) = arg.node {
+                            let place_ty = place.ty(self.body, self.tcx).ty;
+                            if let ty::Closure(closure_def_id, _) | ty::FnDef(closure_def_id, _) =
+                                place_ty.kind()
+                            {
+                                if let Some(callee) = Instance::try_resolve(
+                                    self.tcx,
+                                    typing_env,
+                                    *closure_def_id,
+                                    substs,
+                                )
+                                .ok()
+                                .flatten()
+                                {
+                                    self.callsites.push((callee, CallSiteLocation::RayonJoin));
+                                }
+                            }
+                        }
+                    }
+                    return;
+                }
+
                 // 处理普通函数调用
                 if let Some(callee) = Instance::try_resolve(self.tcx, typing_env, def_id, substs)
                     .ok()