Skip to content
Snippets Groups Projects
Commit e39c7a37 authored by qmuntal's avatar qmuntal Committed by Quim Muntal
Browse files

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: default avatarBryan Mills <bcmills@google.com>
Run-TryBot: Quim Muntal <quimmuntal@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: default avatarAlex Brainman <alex.brainman@gmail.com>
Reviewed-by: default avatarCherry Mui <cherryyz@google.com>
parent 030ca34f
No related branches found
No related tags found
No related merge requests found
...@@ -79,8 +79,11 @@ func TestVectoredHandlerDontCrashOnLibrary(t *testing.T) { ...@@ -79,8 +79,11 @@ func TestVectoredHandlerDontCrashOnLibrary(t *testing.T) {
if *flagQuick { if *flagQuick {
t.Skip("-quick") t.Skip("-quick")
} }
if runtime.GOARCH != "amd64" { if runtime.GOARCH == "arm" {
t.Skip("this test can only run on windows/amd64") //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.MustHaveGoBuild(t)
testenv.MustHaveCGO(t) testenv.MustHaveCGO(t)
......
...@@ -11,8 +11,15 @@ LONG WINAPI customExceptionHandlder(struct _EXCEPTION_POINTERS *ExceptionInfo) ...@@ -11,8 +11,15 @@ LONG WINAPI customExceptionHandlder(struct _EXCEPTION_POINTERS *ExceptionInfo)
exceptionCount++; exceptionCount++;
// prepare context to resume execution // prepare context to resume execution
CONTEXT *c = ExceptionInfo->ContextRecord; CONTEXT *c = ExceptionInfo->ContextRecord;
c->Rip = *(ULONG_PTR *)c->Rsp; #ifdef _AMD64_
c->Rip = *(DWORD64 *)c->Rsp;
c->Rsp += 8; 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_EXECUTION;
} }
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment