Revert "Add miri shims for gettid-like functions"

This reverts commit 4e8452a.

Author: tgross35

src/tools/miri/src/shims/env.rs

@@ -114,17 +114,4 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let this = self.eval_context_ref();
         if this.machine.communicate() { std::process::id() } else { 1000 }
     }
-
-    fn get_current_tid(&self) -> u32 {
-        self.get_tid(self.eval_context_ref().machine.threads.active_thread())
-    }
-
-    fn get_tid(&self, thread: ThreadId) -> u32 {
-        let this = self.eval_context_ref();
-        let index = thread.to_u32();
-
-        // todo: is this also true on Windows?
-        // Compute a TID for this thread, ensuring that the main thread has PID == TID.
-        this.get_pid().strict_add(index)
-    }
 }

src/tools/miri/src/shims/unix/env.rs

@@ -7,7 +7,6 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_index::IndexVec;
 use rustc_middle::ty::Ty;
 use rustc_middle::ty::layout::LayoutOf;
-use rustc_span::Symbol;
 
 use crate::*;
 
@@ -276,34 +275,15 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         interp_ok(Scalar::from_u32(this.get_pid()))
     }
 
-    /// The `gettid`-like function for Unix platforms that take no parameters
-    fn unix_gettid(&mut self, _link_name: Symbol) -> InterpResult<'tcx, Scalar> {
+    fn linux_gettid(&mut self) -> InterpResult<'tcx, Scalar> {
         let this = self.eval_context_ref();
+        this.assert_target_os("linux", "gettid");
 
-        // todo: assert the platform
+        let index = this.machine.threads.active_thread().to_u32();
 
-        interp_ok(Scalar::from_u32(this.get_current_tid()))
-    }
-
-    /// The Apple-specific `int pthread_threadid_np(pthread_t thread, uint64_t *thread_id)`
-    fn apple_pthread_threadip_np(
-        &mut self,
-        thread_op: &OpTy<'tcx>,
-        tid_op: &OpTy<'tcx>,
-    ) -> InterpResult<'tcx, Scalar> {
-        let this = self.eval_context_mut();
-
-        // todo: assert the platform
-
-        let thread = this.read_target_usize(thread_op)?;
-
-        // todo: real error
-        assert_eq!(thread, 0, "querying the thread ID of other threads is not yet supported");
-
-        let tid_dest = this.deref_pointer_as(tid_op, this.machine.layouts.u64)?;
-        this.write_int(this.get_current_tid(), &tid_dest)?;
+        // Compute a TID for this thread, ensuring that the main thread has PID == TID.
+        let tid = this.get_pid().strict_add(index);
 
-        // Never an error if we only ever check the current thread.
-        interp_ok(Scalar::from_u32(0))
+        interp_ok(Scalar::from_u32(tid))
     }
 }

src/tools/miri/src/shims/unix/freebsd/foreign_items.rs

@@ -56,11 +56,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 };
                 this.write_scalar(res, dest)?;
             }
-            "pthread_getthreadid_np" => {
-                let [] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
-                let result = this.unix_gettid(link_name)?;
-                this.write_scalar(result, dest)?;
-            }
 
             "cpuset_getaffinity" => {
                 // The "same" kind of api as `sched_getaffinity` but more fine grained control for FreeBSD specifically.

src/tools/miri/src/shims/unix/linux/foreign_items.rs

@@ -117,7 +117,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
             "gettid" => {
                 let [] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
-                let result = this.unix_gettid(link_name)?;
+                let result = this.linux_gettid()?;
                 this.write_scalar(result, dest)?;
             }
 

src/tools/miri/src/shims/unix/macos/foreign_items.rs

@@ -222,11 +222,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 };
                 this.write_scalar(res, dest)?;
             }
-            "pthread_threadid_np" => {
-                let [thread, tid_ptr] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
-                let res = this.apple_pthread_threadip_np(thread, tid_ptr)?;
-                this.write_scalar(res, dest)?;
-            }
 
             // Synchronization primitives
             "os_sync_wait_on_address" => {

src/tools/miri/src/shims/unix/solarish/foreign_items.rs

@@ -84,11 +84,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 };
                 this.write_scalar(res, dest)?;
             }
-            "thr_self" => {
-                let [] = this.check_shim(abi, CanonAbi::C, link_name, args)?;
-                let result = this.unix_gettid(link_name)?;
-                this.write_scalar(result, dest)?;
-            }
 
             // File related shims
             "stat" | "stat64" => {

src/tools/miri/src/shims/windows/foreign_items.rs

@@ -630,18 +630,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_scalar(name, &name_ptr)?;
                 this.write_scalar(res, dest)?;
             }
-            "GetThreadId" => {
-                let [handle] = this.check_shim(abi, sys_conv, link_name, args)?;
-                let handle = this.read_handle(handle, "GetThreadId")?;
-
-                let thread = match handle {
-                    Handle::Thread(thread) => thread,
-                    Handle::Pseudo(PseudoHandle::CurrentThread) => this.active_thread(),
-                    _ => this.invalid_handle("GetThreadDescription")?,
-                };
-
-                this.write_scalar(Scalar::from_u32(this.get_tid(thread)), dest)?;
-            }
 
             // Miscellaneous
             "ExitProcess" => {