mirror of
https://github.com/golang/go
synced 2024-11-24 12:40:12 -07:00
runtime: run TestVectoredHandlerDontCrashOnLibrary on 386 and arm64
This CL updates TestVectoredHandlerDontCrashOnLibrary so it can run on windows/386 and windows/arm64. It still can't run on windows/arm as it does not support c-shared buildmode (see #43800). Change-Id: Id1577687e165e77d27633c632634ecf86e6e9d6f Reviewed-on: https://go-review.googlesource.com/c/go/+/463117 Reviewed-by: Bryan Mills <bcmills@google.com> Run-TryBot: Quim Muntal <quimmuntal@gmail.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Alex Brainman <alex.brainman@gmail.com> Reviewed-by: Cherry Mui <cherryyz@google.com>
This commit is contained in:
parent
030ca34f57
commit
e39c7a37f0
@ -79,8 +79,11 @@ func TestVectoredHandlerDontCrashOnLibrary(t *testing.T) {
|
||||
if *flagQuick {
|
||||
t.Skip("-quick")
|
||||
}
|
||||
if runtime.GOARCH != "amd64" {
|
||||
t.Skip("this test can only run on windows/amd64")
|
||||
if runtime.GOARCH == "arm" {
|
||||
//TODO: remove this skip and update testwinlib/main.c
|
||||
// once windows/arm supports c-shared buildmode.
|
||||
// See go.dev/issues/43800.
|
||||
t.Skip("this test can't run on windows/arm")
|
||||
}
|
||||
testenv.MustHaveGoBuild(t)
|
||||
testenv.MustHaveCGO(t)
|
||||
|
9
src/runtime/testdata/testwinlib/main.c
vendored
9
src/runtime/testdata/testwinlib/main.c
vendored
@ -11,8 +11,15 @@ LONG WINAPI customExceptionHandlder(struct _EXCEPTION_POINTERS *ExceptionInfo)
|
||||
exceptionCount++;
|
||||
// prepare context to resume execution
|
||||
CONTEXT *c = ExceptionInfo->ContextRecord;
|
||||
c->Rip = *(ULONG_PTR *)c->Rsp;
|
||||
#ifdef _AMD64_
|
||||
c->Rip = *(DWORD64 *)c->Rsp;
|
||||
c->Rsp += 8;
|
||||
#elif defined(_X86_)
|
||||
c->Eip = *(DWORD *)c->Esp;
|
||||
c->Esp += 4;
|
||||
#else
|
||||
c->Pc = c->Lr;
|
||||
#endif
|
||||
return EXCEPTION_CONTINUE_EXECUTION;
|
||||
}
|
||||
return EXCEPTION_CONTINUE_SEARCH;
|
||||
|
Loading…
Reference in New Issue
Block a user