Skip to content

Commit 24fdaed

Browse files
committed
Auto merge of #28457 - VHaravy:test-run-pass-x86stdcall2, r=huonw
Type `HANDLE` is defined on Windows as `PVOID`. Test `run-pass/x86stdcall2` defined it as `u32` that caused access violation in `catch_panic` routine at the line: ``` try!(unwind::try(move || *result = Some(f()))) ``` The original failure is as follows: ``` ---- [run-pass] run-pass/x86stdcall2.rs stdout ---- error: test run failed! status: exit code: -1073741819 command: PATH="x86_64-pc-windows-msvc/stage2/bin/rustlib/x86_64-pc-windows-msvc/lib;D:\Sources\Rust\x86_64-pc-windows-msvc\stage2\bin;C:\MSYS2\mingw64\bin;C:\MSYS2\usr\local\bin;C:\MSYS2\usr\bin;C:\MSYS2\usr\bin;C:\Program Files\Python 3;C:\Program Files\Python 3\Scripts;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit;C:\Program Files\SlikSvn\bin;C:\Program Files\System Tools;C:\Program Files (x86)\System Tools;C:\Program Files\Vim\vim74;C:\Program Files\Rust\bin;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\MiKTeX\miktex\bin\x64;C:\Program Files (x86)\Pandoc;C:\Program Files\LLVM\bin;C:\Program Files\KDiff3;C:\Program Files\Git\cmd;C:\Users\Vitali\AppData\Local\atom\bin;C:\MSYS2\usr\bin\site_perl;C:\MSYS2\usr\bin\vendor_perl;C:\MSYS2\usr\bin\core_perl" x86_64-pc-windows-msvc/test/run-pass\x86stdcall2.stage2-x86_64-pc-windows-msvc.exe stdout: ------------------------------------------ ------------------------------------------ stderr: ------------------------------------------ ------------------------------------------ thread '[run-pass] run-pass/x86stdcall2.rs' panicked at 'explicit panic', D:/Sources/Rust/src/compiletest\runtest.rs:1501 ``` P.S. I compiled rust for `x86_64-pc-windows-msvc`.
2 parents 8ea2198 + 7ff85cd commit 24fdaed

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/test/run-pass/x86stdcall2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![feature(std_misc)]
1212

13-
pub type HANDLE = u32;
13+
pub type HANDLE = usize;
1414
pub type DWORD = u32;
1515
pub type SIZE_T = u32;
1616
pub type LPVOID = usize;

0 commit comments

Comments
 (0)