move closehandle to handle.rs & remove an as cast

Author: beepster4096

src/shims/windows/foreign_items.rs

@@ -10,7 +10,7 @@ use rustc_target::spec::abi::Abi;
 use crate::thread::Time;
 use crate::*;
 use shims::foreign_items::EmulateByNameResult;
-use shims::windows::handle::Handle;
+use shims::windows::handle::{EvalContextExt as _, Handle};
 use shims::windows::sync::EvalContextExt as _;
 use shims::windows::thread::EvalContextExt as _;
 
@@ -393,10 +393,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 let [handle] =
                     this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?;
 
-                match Handle::from_scalar(this.read_scalar(handle)?.check_init()?, this)? {
-                    Some(Handle::Thread(thread)) => this.detach_thread(thread)?,
-                    _ => throw_ub_format!("invalid handle"),
-                };
+                this.CloseHandle(handle)?;
 
                 this.write_scalar(Scalar::from_u32(1), dest)?;
             }

src/shims/windows/handle.rs

@@ -109,9 +109,11 @@ impl Handle {
     }
 
     fn from_packed(handle: i64) -> Option<Self> {
+        let current_thread_val = Self::CURRENT_THREAD_VALUE as i64;
+
         if handle == 0 {
             Some(Self::Null)
-        } else if handle == Self::CURRENT_THREAD_VALUE as i64 {
+        } else if handle == current_thread_val {
             Some(Self::CurrentThread)
         } else if let Ok(handle) = handle.try_into() {
             match RealHandle::from_packed(handle)? {
@@ -132,3 +134,19 @@ impl Handle {
         Ok(Self::from_packed(handle))
     }
 }
+
+impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
+
+#[allow(non_snake_case)]
+pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
+    fn CloseHandle(&mut self, handle_op: &OpTy<'tcx, Tag>) -> InterpResult<'tcx> {
+        let this = self.eval_context_mut();
+
+        match Handle::from_scalar(this.read_scalar(handle_op)?.check_init()?, this)? {
+            Some(Handle::Thread(thread)) => this.detach_thread(thread)?,
+            _ => throw_ub_format!("invalid handle"),
+        };
+
+        Ok(())
+    }
+}