diff --git a/rust-version b/rust-version index 09a847a94f..e7a7ad9dd8 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c35035cefc709abddabfb28ecc6a326458d46ce2 +4e725bad73747a4c93a3ac53106e4b4006edc665 diff --git a/src/shims/windows/dlsym.rs b/src/shims/windows/dlsym.rs index fb0c334b3d..60ef11b796 100644 --- a/src/shims/windows/dlsym.rs +++ b/src/shims/windows/dlsym.rs @@ -18,6 +18,7 @@ impl Dlsym { pub fn from_str<'tcx>(name: &str) -> InterpResult<'tcx, Option> { Ok(match name { "GetSystemTimePreciseAsFileTime" => None, + "SetThreadDescription" => None, "NtWriteFile" => Some(Dlsym::NtWriteFile), _ => throw_unsup_format!("unsupported Windows dlsym: {}", name), }) diff --git a/src/shims/windows/foreign_items.rs b/src/shims/windows/foreign_items.rs index 1a9b2300f7..05f9aed174 100644 --- a/src/shims/windows/foreign_items.rs +++ b/src/shims/windows/foreign_items.rs @@ -415,6 +415,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx // There is only one thread, so this always succeeds and returns TRUE. this.write_scalar(Scalar::from_i32(1), dest)?; } + "GetCurrentThread" if this.frame_in_std() => { + let [] = this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?; + this.write_scalar(Scalar::from_machine_isize(1, this), dest)?; + } _ => return Ok(EmulateByNameResult::NotSupported), }