Rollup merge of rust-lang#121633 - ChrisDenton:precise, r=Nilstrieb

Win10: Use `GetSystemTimePreciseAsFileTime` directly On Windows 10 we can use `GetSystemTimePreciseAsFileTime` directly instead of lazy loading it (with a fallback).
jhpratt · Mar 11, 2024 · 0933a32 · 0933a32
2 parents b850549 + eb40adb
commit 0933a32
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs
@@ -344,6 +344,7 @@ compat_fn_with_fallback! {
 
  // >= Win8 / Server 2012
  // https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtimepreciseasfiletime
+ #[cfg(target_vendor = "win7")]
  pub fn GetSystemTimePreciseAsFileTime(lpsystemtimeasfiletime: *mut FILETIME) -> () {
  GetSystemTimeAsFileTime(lpsystemtimeasfiletime)
  }

diff --git a/library/std/src/sys/pal/windows/c/bindings.txt b/library/std/src/sys/pal/windows/c/bindings.txt
@@ -2476,6 +2476,7 @@ Windows.Win32.System.Pipes.PIPE_WAIT
 Windows.Win32.System.SystemInformation.GetSystemDirectoryW
 Windows.Win32.System.SystemInformation.GetSystemInfo
 Windows.Win32.System.SystemInformation.GetSystemTimeAsFileTime
+Windows.Win32.System.SystemInformation.GetSystemTimePreciseAsFileTime
 Windows.Win32.System.SystemInformation.GetWindowsDirectoryW
 Windows.Win32.System.SystemInformation.PROCESSOR_ARCHITECTURE
 Windows.Win32.System.SystemInformation.SYSTEM_INFO

diff --git a/library/std/src/sys/pal/windows/c/windows_sys.rs b/library/std/src/sys/pal/windows/c/windows_sys.rs
@@ -345,6 +345,10 @@ extern "system" {
  pub fn GetSystemTimeAsFileTime(lpsystemtimeasfiletime: *mut FILETIME) -> ();
 }
 #[link(name = "kernel32")]
+extern "system" {
+ pub fn GetSystemTimePreciseAsFileTime(lpsystemtimeasfiletime: *mut FILETIME) -> ();
+}
+#[link(name = "kernel32")]
 extern "system" {
  pub fn GetTempPathW(nbufferlength: u32, lpbuffer: PWSTR) -> u32;
 }

diff --git a/src/tools/miri/src/shims/time.rs b/src/tools/miri/src/shims/time.rs
@@ -110,12 +110,13 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
  #[allow(non_snake_case, clippy::arithmetic_side_effects)]
  fn GetSystemTimeAsFileTime(
  &mut self,
+ shim_name: &str,
  LPFILETIME_op: &OpTy<'tcx, Provenance>,
  ) -> InterpResult<'tcx> {
  let this = self.eval_context_mut();
 
- this.assert_target_os("windows", "GetSystemTimeAsFileTime");
- this.check_no_isolation("`GetSystemTimeAsFileTime`")?;
+ this.assert_target_os("windows", shim_name);
+ this.check_no_isolation(shim_name)?;
 
  let filetime = this.deref_pointer_as(LPFILETIME_op, this.windows_ty_layout("FILETIME"))?;
 

diff --git a/src/tools/miri/src/shims/windows/foreign_items.rs b/src/tools/miri/src/shims/windows/foreign_items.rs
@@ -257,11 +257,11 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
  }
 
  // Time related shims
- "GetSystemTimeAsFileTime" => {
+ "GetSystemTimeAsFileTime" | "GetSystemTimePreciseAsFileTime" => {
  #[allow(non_snake_case)]
  let [LPFILETIME] =
  this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?;
- this.GetSystemTimeAsFileTime(LPFILETIME)?;
+ this.GetSystemTimeAsFileTime(link_name.as_str(), LPFILETIME)?;
  }
  "QueryPerformanceCounter" => {
  #[allow(non_snake_case)]