Commit d5004ee6 authored by Alex Brainman's avatar Alex Brainman

runtime: use AddVectoredContinueHandler on Windows XP amd64

Recent change (CL 10370) unexpectedly broke TestRaiseException on
Windows XP amd64. I still do not know why. But reverting old
CL 8165 fixes the problem.

This effectively makes Windows XP amd64 use AddVectoredContinueHandler
instead of SetUnhandledExceptionFilter for exception handling. That is
what we do for all recent Windows versions too.

Fixes #11481

Change-Id: If2e8037711f05bf97e3c69f5a8d86af67c58f6fc
Reviewed-on: https://go-review.googlesource.com/11888
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
Reviewed-by: 's avatarDaniel Theophanes <kardianos@gmail.com>
Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
parent 8b221092
...@@ -26,7 +26,6 @@ import ( ...@@ -26,7 +26,6 @@ import (
//go:cgo_import_dynamic runtime._GetStdHandle GetStdHandle%1 "kernel32.dll" //go:cgo_import_dynamic runtime._GetStdHandle GetStdHandle%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll" //go:cgo_import_dynamic runtime._GetSystemInfo GetSystemInfo%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll" //go:cgo_import_dynamic runtime._GetThreadContext GetThreadContext%2 "kernel32.dll"
//go:cgo_import_dynamic runtime._GetVersion GetVersion%0 "kernel32.dll"
//go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll" //go:cgo_import_dynamic runtime._LoadLibraryW LoadLibraryW%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll" //go:cgo_import_dynamic runtime._LoadLibraryA LoadLibraryA%1 "kernel32.dll"
//go:cgo_import_dynamic runtime._NtWaitForSingleObject NtWaitForSingleObject%3 "ntdll.dll" //go:cgo_import_dynamic runtime._NtWaitForSingleObject NtWaitForSingleObject%3 "ntdll.dll"
...@@ -68,7 +67,6 @@ var ( ...@@ -68,7 +67,6 @@ var (
_GetStdHandle, _GetStdHandle,
_GetSystemInfo, _GetSystemInfo,
_GetThreadContext, _GetThreadContext,
_GetVersion,
_LoadLibraryW, _LoadLibraryW,
_LoadLibraryA, _LoadLibraryA,
_NtWaitForSingleObject, _NtWaitForSingleObject,
...@@ -138,12 +136,6 @@ const ( ...@@ -138,12 +136,6 @@ const (
currentThread = ^uintptr(1) // -2 = current thread currentThread = ^uintptr(1) // -2 = current thread
) )
func getVersion() (major, minor byte) {
v := uint32(stdcall0(_GetVersion))
low := uint16(v)
return byte(low), byte(low >> 8)
}
// in sys_windows_386.s and sys_windows_amd64.s // in sys_windows_386.s and sys_windows_amd64.s
func externalthreadhandler() func externalthreadhandler()
......
...@@ -26,14 +26,10 @@ func firstcontinuetramp() ...@@ -26,14 +26,10 @@ func firstcontinuetramp()
func lastcontinuetramp() func lastcontinuetramp()
func initExceptionHandler() { func initExceptionHandler() {
major, _ := getVersion()
stdcall2(_AddVectoredExceptionHandler, 1, funcPC(exceptiontramp)) stdcall2(_AddVectoredExceptionHandler, 1, funcPC(exceptiontramp))
if _AddVectoredContinueHandler == nil || unsafe.Sizeof(&_AddVectoredContinueHandler) == 4 || major < 6 { if _AddVectoredContinueHandler == nil || unsafe.Sizeof(&_AddVectoredContinueHandler) == 4 {
// use SetUnhandledExceptionFilter for windows-386 or // use SetUnhandledExceptionFilter for windows-386 or
// if VectoredContinueHandler is unavailable or // if VectoredContinueHandler is unavailable.
// if running windows-amd64 v5. V5 appears to fail to
// call the continue handlers if windows error reporting dialog
// is disabled.
// note: SetUnhandledExceptionFilter handler won't be called, if debugging. // note: SetUnhandledExceptionFilter handler won't be called, if debugging.
stdcall1(_SetUnhandledExceptionFilter, funcPC(lastcontinuetramp)) stdcall1(_SetUnhandledExceptionFilter, funcPC(lastcontinuetramp))
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment